summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2011-08-03 19:38:42 (GMT)
committerdgp <dgp@users.sourceforge.net>2011-08-03 19:38:42 (GMT)
commitad5c7a8175d203d8a6dcf4a8e268d28059dfe651 (patch)
tree0d8b521e60e1f63be47f62f58510415ddae017df /generic
parentbb1b4d762f85876ac8f9e2604d3f4bf24b7ac2a2 (diff)
parent92c2318f0bcf65d962079a1dc6cec0326921a2b5 (diff)
downloadtcl-ad5c7a8175d203d8a6dcf4a8e268d28059dfe651.zip
tcl-ad5c7a8175d203d8a6dcf4a8e268d28059dfe651.tar.gz
tcl-ad5c7a8175d203d8a6dcf4a8e268d28059dfe651.tar.bz2
merge to rc
Diffstat (limited to 'generic')
-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