diff options
| author | nijtmans <nijtmans> | 2010-06-28 08:24:44 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2010-06-28 08:24:44 (GMT) |
| commit | 1183c0a828a1e53bdbc5aba282093407eed9aa18 (patch) | |
| tree | 8b49df5e26edc32443813d39427f5a7dd3439c1d | |
| parent | c9c189e5d4c7c9bf1c335a719d9f0071de8bd330 (diff) | |
| download | tcl-1183c0a828a1e53bdbc5aba282093407eed9aa18.zip tcl-1183c0a828a1e53bdbc5aba282093407eed9aa18.tar.gz tcl-1183c0a828a1e53bdbc5aba282093407eed9aa18.tar.bz2 | |
[Bug 3019634] errno.h and tclWinPort.h have conflicting definitions.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | generic/tclPosixStr.c | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -1,4 +1,4 @@ -2010-06-24 Jan Nijtmans <nijtmans@users.sf.net> +2010-06-28 Jan Nijtmans <nijtmans@users.sf.net> * generic/tclPosixStr.c [Bug 3019634] errno.h and tclWinPort.h have conflicting definitions. diff --git a/generic/tclPosixStr.c b/generic/tclPosixStr.c index 44d48f3..f5ea7b9 100644 --- a/generic/tclPosixStr.c +++ b/generic/tclPosixStr.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclPosixStr.c,v 1.12.10.3 2010/06/24 14:21:12 nijtmans Exp $ + * RCS: @(#) $Id: tclPosixStr.c,v 1.12.10.4 2010/06/28 08:24:44 nijtmans Exp $ */ #include "tclInt.h" @@ -720,7 +720,7 @@ Tcl_ErrnoMsg( case ENOLCK: return "no locks available"; #endif #if defined(ENOLINK) && (!defined(ESOCKTNOSUPPORT) || (ESOCKTNOSUPPORT != ENOLINK)) - case ENOLINK: return "link has be severed"; + case ENOLINK: return "link has been severed"; #endif #ifdef ENOMEM case ENOMEM: return "not enough memory"; @@ -849,7 +849,7 @@ Tcl_ErrnoMsg( case ERREMOTE: return "object is remote"; #endif #ifdef ESHUTDOWN - case ESHUTDOWN: return "can't send afer socket shutdown"; + case ESHUTDOWN: return "can't send after socket shutdown"; #endif #ifdef ESOCKTNOSUPPORT case ESOCKTNOSUPPORT: return "socket type not supported"; @@ -906,7 +906,7 @@ Tcl_ErrnoMsg( #ifdef NO_STRERROR return "unknown POSIX error"; #else - return strerror(errno); + return strerror(err); #endif } } |