diff options
| author | nijtmans <nijtmans> | 2008-10-08 21:35:17 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2008-10-08 21:35:17 (GMT) |
| commit | 4ff44a77ace5e7a16b6a1313039cfa71a82d02f9 (patch) | |
| tree | 5f5fc814bf93245e888ffecc16d6bd44e75a5cc0 /unix | |
| parent | 3dac24314a5483f488d9d5255b7fb6bbeba91b3b (diff) | |
| download | tcl-4ff44a77ace5e7a16b6a1313039cfa71a82d02f9.zip tcl-4ff44a77ace5e7a16b6a1313039cfa71a82d02f9.tar.gz tcl-4ff44a77ace5e7a16b6a1313039cfa71a82d02f9.tar.bz2 | |
* unix/tclUnixChan.c: fix minor compiler warning
* unix/tcl.m4: fix for bug [2073255]
* unix/configure: regenerated
Diffstat (limited to 'unix')
| -rwxr-xr-x | unix/configure | 17 | ||||
| -rw-r--r-- | unix/tcl.m4 | 15 | ||||
| -rw-r--r-- | unix/tclUnixChan.c | 4 |
3 files changed, 18 insertions, 18 deletions
diff --git a/unix/configure b/unix/configure index 71235e3..1348e0a 100755 --- a/unix/configure +++ b/unix/configure @@ -6722,14 +6722,12 @@ fi if test "$tcl_ok" = yes; then - SHLIB_CFLAGS="+z" - SHLIB_LD="ld -b" SHLIB_LD_LIBS='${LIBS}' DL_OBJS="tclLoadShl.o" DL_LIBS="-ldld" LDFLAGS="$LDFLAGS -Wl,-E" CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.' - LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.' + LD_SEARCH_FLAGS='-Wl,+s +b ${LIB_RUNTIME_DIR}:.' LD_LIBRARY_PATH_VAR="SHLIB_PATH" fi @@ -6737,14 +6735,17 @@ fi if test "$GCC" = yes; then SHLIB_LD='${CC} -shared' - SHLIB_LD_LIBS='${LIBS}' - LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} -fi +else + CFLAGS="$CFLAGS -z" + # Users may want PA-RISC 1.1/2.0 portable code - needs HP cc + #CFLAGS="$CFLAGS +DAportable" + SHLIB_CFLAGS="+z" + SHLIB_LD="${CC} -Wl,-b" + +fi - # Users may want PA-RISC 1.1/2.0 portable code - needs HP cc - #CFLAGS="$CFLAGS +DAportable" # Check to enable 64-bit flags for compiler/linker if test "$do64bit" = "yes"; then diff --git a/unix/tcl.m4 b/unix/tcl.m4 index c5be8f0..3e4979a 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1262,25 +1262,24 @@ dnl AC_CHECK_TOOL(AR, ar) ]) AC_CHECK_LIB(dld, shl_load, tcl_ok=yes, tcl_ok=no) AS_IF([test "$tcl_ok" = yes], [ - SHLIB_CFLAGS="+z" - SHLIB_LD="ld -b" SHLIB_LD_LIBS='${LIBS}' DL_OBJS="tclLoadShl.o" DL_LIBS="-ldld" LDFLAGS="$LDFLAGS -Wl,-E" CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.' - LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.' + LD_SEARCH_FLAGS='-Wl,+s +b ${LIB_RUNTIME_DIR}:.' LD_LIBRARY_PATH_VAR="SHLIB_PATH" ]) AS_IF([test "$GCC" = yes], [ SHLIB_LD='${CC} -shared' - SHLIB_LD_LIBS='${LIBS}' - LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} + ], [ + CFLAGS="$CFLAGS -z" + # Users may want PA-RISC 1.1/2.0 portable code - needs HP cc + #CFLAGS="$CFLAGS +DAportable" + SHLIB_CFLAGS="+z" + SHLIB_LD="${CC} -Wl,-b" ]) - # Users may want PA-RISC 1.1/2.0 portable code - needs HP cc - #CFLAGS="$CFLAGS +DAportable" - # Check to enable 64-bit flags for compiler/linker AS_IF([test "$do64bit" = "yes"], [ AS_IF([test "$GCC" = yes], [ diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c index 3e99c14..a80e7bb 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.94 2008/08/05 23:47:12 jenglish Exp $ + * RCS: @(#) $Id: tclUnixChan.c,v 1.95 2008/10/08 21:35:17 nijtmans Exp $ */ #include "tclInt.h" /* Internal definitions for Tcl. */ @@ -2800,7 +2800,7 @@ TclpGetDefaultStdChannel( Tcl_Channel channel = NULL; int fd = 0; /* Initializations needed to prevent */ int mode = 0; /* compiler warning (used before set). */ - char *bufMode = NULL; + const char *bufMode = NULL; /* * Some #def's to make the code a little clearer! |