From 83cc84e37ef119daa5e1134aec6ce159a68799cb Mon Sep 17 00:00:00 2001
From: hobbs <hobbs>
Date: Wed, 26 Jan 2000 03:38:00 +0000
Subject: 	* unix/tcl.m4: modified EXTRA_CFLAGS to add -DHAVE_TZSET for 
 OSF1-V* and ULTRIX-4.* when not using gcc.  Also added higher min 	stack
 size for OSF1-V* when building with threads. [Bug: 4063] 	*
 unix/tclUnixChan.c (CreateSocketAddress): changed comparison 	with -1 to
 0xFFFFFFFF, to ensure 32 bit comparison even on 64 bit 	systems. [Bug:
 3878]

---
 unix/tcl.m4        | 15 +++++++++++----
 unix/tclUnixChan.c |  8 ++++----
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/unix/tcl.m4 b/unix/tcl.m4
index fc65913..d268471 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -768,8 +768,6 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
 		DL_OBJS="tclLoadDl.o"
 		DL_LIBS=""
 		LDFLAGS=""
-		LD_SEARCH_FLAGS=""
-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
 		LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 		AC_MSG_CHECKING(for ELF)
 		AC_EGREP_CPP(yes, [
@@ -857,15 +855,21 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
 	    DL_LIBS=""
 	    LDFLAGS=""
 	    LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+	    if test "$using_gcc" = "no" ; then
+		EXTRA_CFLAGS="-DHAVE_TZSET -std1"
+	    fi
 	    # see pthread_intro(3) for pthread support on osf1, k.furukawa
 	    if test "${TCL_THREADS}" = "1" ; then
+		EXTRA_CFLAGS="${EXTRA_CFLAGS} -DTCL_THREAD_STACK_MIN=PTHREAD_STACK_MIN*64"
 		if test "$using_gcc" = "no" ; then
-		    EXTRA_CFLAGS="-std1 -pthread"
+		    EXTRA_CFLAGS="${EXTRA_CFLAGS} -pthread"
 		    LDFLAGS="-pthread"
+		    THREADS_LIBS=""
 		else
-		    THREADS_LIBS=" -lpthread -lmach -lexc -lc"
+		    THREADS_LIBS=" -lpthread -lmach -lexc"
 		fi
 	    fi
+
 	    ;;
 	RISCos-*)
 	    SHLIB_CFLAGS="-G 0"
@@ -981,6 +985,9 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
 	    DL_LIBS=""
 	    LDFLAGS="-Wl,-D,08000000"
 	    LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
+	    if test "$using_gcc" = "no" ; then
+		EXTRA_CFLAGS="-DHAVE_TZSET -std1"
+	    fi
 	    ;;
 	UNIX_SV* | UnixWare-5*)
 	    SHLIB_CFLAGS="-KPIC"
diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c
index 7d063f3..06a8a42 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.12 2000/01/24 02:30:16 hobbs Exp $
+ * RCS: @(#) $Id: tclUnixChan.c,v 1.13 2000/01/26 03:38:00 hobbs Exp $
  */
 
 #include	"tclInt.h"	/* Internal definitions for Tcl. */
@@ -2123,10 +2123,10 @@ CreateSocketAddress(sockaddrPtr, host, port)
 	}
         addr.s_addr = inet_addr(native);		/* INTL: Native. */
 	/*
-	 * 0xFFFFFFFFFFFFFFF is the pedantic way to say -1
-	 * for either 32 or 64 bits systems.
+	 * This is 0xFFFFFFFF to ensure that it compares as a 32bit -1
+	 * on either 32 or 64 bits systems.
 	 */
-        if (addr.s_addr == 0xFFFFFFFFFFFFFFF) {
+        if (addr.s_addr == 0xFFFFFFFF) {
             hostent = gethostbyname(native);		/* INTL: Native. */
             if (hostent != NULL) {
                 memcpy((VOID *) &addr,
-- 
cgit v0.12