summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--unix/tclUnixChan.c6
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 05bba3b..3020402 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-03 Donal K. Fellows <dkf@users.sf.net>
+
+ * unix/tclUnixChan.c (CreateSocketAddress): Add extra #ifdef-fery to
+ make code compile on BSD 5. [Bug 1618235, again]
+
2007-12-03 Don Porter <dgp@users.sourceforge.net>
* library/tcltest/tcltest.tcl: Bump tcltest to version 2.3.0 so that
diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c
index b4882c8..85cc82a 100644
--- a/unix/tclUnixChan.c
+++ b/unix/tclUnixChan.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: tclUnixChan.c,v 1.87 2007/11/13 15:50:59 dkf Exp $
+ * RCS: @(#) $Id: tclUnixChan.c,v 1.88 2007/12/03 21:39:04 dkf Exp $
*/
#include "tclInt.h" /* Internal definitions for Tcl. */
@@ -2686,8 +2686,12 @@ CreateSocketAddress(
switch (result) {
case EAI_NONAME:
case EAI_SERVICE:
+#if defined(EAI_ADDRFAMILY) && EAI_ADDRFAMILY != EAI_NONAME
case EAI_ADDRFAMILY:
+#endif
+#if defined(EAI_NODATA) && EAI_NODATA != EAI_NONAME
case EAI_NODATA:
+#endif
*errorMsgPtr = gai_strerror(result);
errno = EHOSTUNREACH;
return 0;