diff options
| -rw-r--r-- | generic/tclVar.c | 15 | ||||
| -rw-r--r-- | tools/genStubs.tcl | 5 | ||||
| -rw-r--r-- | unix/Makefile.in | 6 | ||||
| -rwxr-xr-x | unix/configure | 5 | ||||
| -rw-r--r-- | unix/tcl.m4 | 8 | ||||
| -rw-r--r-- | win/Makefile.in | 6 |
6 files changed, 11 insertions, 34 deletions
diff --git a/generic/tclVar.c b/generic/tclVar.c index c733dce..52eaf9f 100644 --- a/generic/tclVar.c +++ b/generic/tclVar.c @@ -16,7 +16,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclVar.c,v 1.180 2009/07/23 22:49:15 andreas_kupries Exp $ + * RCS: @(#) $Id: tclVar.c,v 1.181 2009/07/23 23:01:59 andreas_kupries Exp $ */ #include "tclInt.h" @@ -67,19 +67,10 @@ VarHashCreateVar( #define VarHashFindVar(tablePtr, key) \ VarHashCreateVar((tablePtr), (key), NULL) -#ifdef _AIX -/* Work around AIX cc problem causing crash in TclDeleteVars. Possible - * optimizer bug. Do _NOT_ inline this function, this re-activates the - * problem. - */ -static void -VarHashInvalidateEntry(Var* varPtr) { - varPtr->flags |= VAR_DEAD_HASH; -} -#else + #define VarHashInvalidateEntry(varPtr) \ ((varPtr)->flags |= VAR_DEAD_HASH) -#endif + #define VarHashDeleteEntry(varPtr) \ Tcl_DeleteHashEntry(&(((VarInHash *) varPtr)->entry)) diff --git a/tools/genStubs.tcl b/tools/genStubs.tcl index 96a1a83..03f7ba5 100644 --- a/tools/genStubs.tcl +++ b/tools/genStubs.tcl @@ -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: genStubs.tcl,v 1.30 2009/07/23 22:49:15 andreas_kupries Exp $ +# RCS: @(#) $Id: genStubs.tcl,v 1.31 2009/07/23 23:02:00 andreas_kupries Exp $ package require Tcl 8.4 @@ -208,9 +208,6 @@ proc genStubs::rewriteFile {file text} { set in [open ${file} r] set out [open ${file}.new w] - # Hardwire the genstubs output to Unix eol. - fconfigure $out -translation lf - while {![eof $in]} { set line [gets $in] if {[string match "*!BEGIN!*" $line]} { diff --git a/unix/Makefile.in b/unix/Makefile.in index 2e1dcc6..8d56305 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -4,7 +4,7 @@ # "./configure", which is a configuration script generated by the "autoconf" # program (constructs like "@foo@" will get replaced in the actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.273 2009/07/23 22:49:15 andreas_kupries Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.274 2009/07/23 23:02:00 andreas_kupries Exp $ VERSION = @TCL_VERSION@ MAJOR_VERSION = @TCL_MAJOR_VERSION@ @@ -912,8 +912,8 @@ install-private-headers: libraries $(INSTALL_DATA) tclConfig.h "$(PRIVATE_INCLUDE_INSTALL_DIR)"; \ fi; -#Makefile: $(UNIX_DIR)/Makefile.in $(DLTEST_DIR)/Makefile.in -# $(SHELL) config.status +Makefile: $(UNIX_DIR)/Makefile.in $(DLTEST_DIR)/Makefile.in + $(SHELL) config.status #tclConfig.h: $(UNIX_DIR)/tclConfig.h.in # $(SHELL) config.status diff --git a/unix/configure b/unix/configure index f490ca6..a926936 100755 --- a/unix/configure +++ b/unix/configure @@ -7175,11 +7175,6 @@ fi fi - # 64bit not requested or not, may still be a 64bit platform. - if test "`uname -m`" = ia64 ; then - SHLIB_LD_LIBS="-L/lib/hpux64 ${SHLIB_LD_LIBS}" -fi - ;; HP-UX-*.08.*|HP-UX-*.09.*|HP-UX-*.10.*) SHLIB_SUFFIX=".sl" diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 28050dd..479ea08 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1312,13 +1312,7 @@ dnl AC_CHECK_TOOL(AR, ar) CFLAGS="$CFLAGS +DD64" LDFLAGS_ARCH="+DD64" ]) - ]) - - # 64bit not requested or not, may still be a 64bit platform. - AS_IF([test "`uname -m`" = ia64], [ - SHLIB_LD_LIBS="-L/lib/hpux64 ${SHLIB_LD_LIBS}" - ]) - ;; + ]) ;; HP-UX-*.08.*|HP-UX-*.09.*|HP-UX-*.10.*) SHLIB_SUFFIX=".sl" AC_CHECK_LIB(dld, shl_load, tcl_ok=yes, tcl_ok=no) diff --git a/win/Makefile.in b/win/Makefile.in index 6983879..f83000e 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -4,7 +4,7 @@ # "./configure", which is a configuration script generated by the "autoconf" # program (constructs like "@foo@" will get replaced in the actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.157 2009/07/23 22:49:16 andreas_kupries Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.158 2009/07/23 23:02:00 andreas_kupries Exp $ VERSION = @TCL_VERSION@ @@ -779,8 +779,8 @@ gdb: binaries depend: -#Makefile: $(SRC_DIR)/Makefile.in -# ./config.status +Makefile: $(SRC_DIR)/Makefile.in + ./config.status cleanhelp: $(RM) *.hlp *.cnt *.GID *.rtf man2tcl.exe |