summaryrefslogtreecommitdiffstats
path: root/generic/tclPosixStr.c
diff options
context:
space:
mode:
authordgp@users.sourceforge.net <dgp>2011-08-03 19:38:42 (GMT)
committerdgp@users.sourceforge.net <dgp>2011-08-03 19:38:42 (GMT)
commit16cc27fb57a0cc201d9771edd95d7686f82678d0 (patch)
tree0d8b521e60e1f63be47f62f58510415ddae017df /generic/tclPosixStr.c
parent7e112f93b35c2d4626e04ad2bb86f3564f906f96 (diff)
parentf5f4664b551f0810c39504b541d257392733c0c4 (diff)
downloadtcl-16cc27fb57a0cc201d9771edd95d7686f82678d0.zip
tcl-16cc27fb57a0cc201d9771edd95d7686f82678d0.tar.gz
tcl-16cc27fb57a0cc201d9771edd95d7686f82678d0.tar.bz2
merge to rc
Diffstat (limited to 'generic/tclPosixStr.c')
-rw-r--r--generic/tclPosixStr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclPosixStr.c b/generic/tclPosixStr.c
index b722336..d0002ec 100644
--- a/generic/tclPosixStr.c
+++ b/generic/tclPosixStr.c
@@ -203,7 +203,7 @@ Tcl_ErrnoId(void)
#ifdef ELIBEXEC
case ELIBEXEC: return "ELIBEXEC";
#endif
-#ifdef ELIBMAX
+#if defined(ELIBMAX) && (!defined(ECANCELED) || (ELIBMAX != ECANCELED))
case ELIBMAX: return "ELIBMAX";
#endif
#ifdef ELIBSCN
@@ -662,7 +662,7 @@ Tcl_ErrnoMsg(
#ifdef ELIBEXEC
case ELIBEXEC: return "cannot exec a shared library directly";
#endif
-#ifdef ELIBMAX
+#if defined(ELIBMAX) && (!defined(ECANCELED) || (ELIBMAX != ECANCELED))
case ELIBMAX: return
"attempting to link in more shared libraries than system limit";
#endif