diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/tclPosixStr.c | 26 |
2 files changed, 18 insertions, 13 deletions
@@ -1,3 +1,8 @@ +2010-06-28 Jan Nijtmans <nijtmans@users.sf.net> + + * generic/tclPosixStr.c [Bug 3019634] errno.h and tclWinPort.h have + conflicting definitions. + 2010-06-09 Andreas Kupries <andreask@activestate.com> * library/platform/platform.tcl: Added OSX Intel 64bit diff --git a/generic/tclPosixStr.c b/generic/tclPosixStr.c index 3b3467d..f158211 100644 --- a/generic/tclPosixStr.c +++ b/generic/tclPosixStr.c @@ -11,7 +11,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.9.2.1 2009/10/21 13:58:48 dkf Exp $ + * RCS: @(#) $Id: tclPosixStr.c,v 1.9.2.2 2010/06/28 08:23:54 nijtmans Exp $ */ #include "tclInt.h" @@ -63,7 +63,7 @@ Tcl_ErrnoId() #ifdef EALIGN case EALIGN: return "EALIGN"; #endif -#if defined(EALREADY) && (!defined(EBUSY) || (EALREADY != EBUSY )) +#if defined(EALREADY) && (!defined(EBUSY) || (EALREADY != EBUSY)) case EALREADY: return "EALREADY"; #endif #ifdef EBADE @@ -273,7 +273,7 @@ Tcl_ErrnoId() #ifdef ENOLCK case ENOLCK: return "ENOLCK"; #endif -#ifdef ENOLINK +#if defined(ENOLINK) && (!defined(ESOCKTNOSUPPORT) || (ESOCKTNOSUPPORT != ENOLINK)) case ENOLINK: return "ENOLINK"; #endif #ifdef ENOMEM @@ -288,7 +288,7 @@ Tcl_ErrnoId() #ifdef ENOPKG case ENOPKG: return "ENOPKG"; #endif -#ifdef ENOPROTOOPT +#if defined(ENOPROTOOPT) && (!defined(EPFNOSUPPORT) || (EPFNOSUPPORT != ENOPROTOOPT)) case ENOPROTOOPT: return "ENOPROTOOPT"; #endif #ifdef ENOSPC @@ -339,7 +339,7 @@ Tcl_ErrnoId() #if defined(EOPNOTSUPP) && (!defined(ENOTSUP) || (ENOTSUP != EOPNOTSUPP)) case EOPNOTSUPP: return "EOPNOTSUPP"; #endif -#if defined(EOVERFLOW) && ( !defined(EFBIG) || (EOVERFLOW != EFBIG) ) && ( !defined(EINVAL) || (EOVERFLOW != EINVAL) ) +#if defined(EOVERFLOW) && (!defined(EFBIG) || (EOVERFLOW != EFBIG)) && (!defined(EINVAL) || (EOVERFLOW != EINVAL)) case EOVERFLOW: return "EOVERFLOW"; #endif #ifdef EPERM @@ -512,7 +512,7 @@ Tcl_ErrnoMsg(err) #ifdef EALIGN case EALIGN: return "EALIGN"; #endif -#if defined(EALREADY) && (!defined(EBUSY) || (EALREADY != EBUSY )) +#if defined(EALREADY) && (!defined(EBUSY) || (EALREADY != EBUSY)) case EALREADY: return "operation already in progress"; #endif #ifdef EBADE @@ -723,8 +723,8 @@ Tcl_ErrnoMsg(err) #ifdef ENOLCK case ENOLCK: return "no locks available"; #endif -#ifdef ENOLINK - case ENOLINK: return "link has be severed"; +#if defined(ENOLINK) && (!defined(ESOCKTNOSUPPORT) || (ESOCKTNOSUPPORT != ENOLINK)) + case ENOLINK: return "link has been severed"; #endif #ifdef ENOMEM case ENOMEM: return "not enough memory"; @@ -738,7 +738,7 @@ Tcl_ErrnoMsg(err) #ifdef ENOPKG case ENOPKG: return "package not installed"; #endif -#ifdef ENOPROTOOPT +#if defined(ENOPROTOOPT) && (!defined(EPFNOSUPPORT) || (EPFNOSUPPORT != ENOPROTOOPT)) case ENOPROTOOPT: return "bad protocol option"; #endif #ifdef ENOSPC @@ -789,7 +789,7 @@ Tcl_ErrnoMsg(err) #if defined(EOPNOTSUPP) && (!defined(ENOTSUP) || (ENOTSUP != EOPNOTSUPP)) case EOPNOTSUPP: return "operation not supported on socket"; #endif -#if defined(EOVERFLOW) && ( !defined(EFBIG) || (EOVERFLOW != EFBIG) ) && ( !defined(EINVAL) || (EOVERFLOW != EINVAL) ) +#if defined(EOVERFLOW) && (!defined(EFBIG) || (EOVERFLOW != EFBIG)) && (!defined(EINVAL) || (EOVERFLOW != EINVAL)) case EOVERFLOW: return "file too big"; #endif #ifdef EPERM @@ -817,7 +817,7 @@ Tcl_ErrnoMsg(err) case EPROTO: return "protocol error"; #endif #ifdef EPROTONOSUPPORT - case EPROTONOSUPPORT: return "protocol not suppored"; + case EPROTONOSUPPORT: return "protocol not supported"; #endif #ifdef EPROTOTYPE case EPROTOTYPE: return "protocol wrong type for socket"; @@ -853,7 +853,7 @@ Tcl_ErrnoMsg(err) 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"; @@ -910,7 +910,7 @@ Tcl_ErrnoMsg(err) #ifdef NO_STRERROR return "unknown POSIX error"; #else - return strerror(errno); + return strerror(err); #endif } } |