summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2008-05-23 21:05:13 (GMT)
committerandreas_kupries <akupries@shaw.ca>2008-05-23 21:05:13 (GMT)
commit6a332b702f97a6c06d57c5e7fc40604cefe40e08 (patch)
treefa12346b4916af7e6abd32ef69fa0b863f8d930b
parent330add62d15d66049d37d4e23a769b78074d15ab (diff)
downloadtcl-6a332b702f97a6c06d57c5e7fc40604cefe40e08.zip
tcl-6a332b702f97a6c06d57c5e7fc40604cefe40e08.tar.gz
tcl-6a332b702f97a6c06d57c5e7fc40604cefe40e08.tar.bz2
Oops. Undo commit of the local tweaks.
-rw-r--r--generic/tclVar.c13
-rw-r--r--tools/genStubs.tcl5
-rw-r--r--unix/Makefile.in8
-rw-r--r--win/Makefile.in6
4 files changed, 9 insertions, 23 deletions
diff --git a/generic/tclVar.c b/generic/tclVar.c
index a88f15c..b7bdcaf 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.161 2008/05/23 21:00:45 andreas_kupries Exp $
+ * RCS: @(#) $Id: tclVar.c,v 1.162 2008/05/23 21:05:13 andreas_kupries Exp $
*/
#include "tclInt.h"
@@ -67,19 +67,8 @@ 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 69f4a84..5172a73 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.27 2008/05/23 21:00:46 andreas_kupries Exp $
+# RCS: @(#) $Id: genStubs.tcl,v 1.28 2008/05/23 21:05:13 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 c930e11..12db7c0 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.232 2008/05/23 21:00:46 andreas_kupries Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.233 2008/05/23 21:05:13 andreas_kupries Exp $
VERSION = @TCL_VERSION@
MAJOR_VERSION = @TCL_MAJOR_VERSION@
@@ -875,8 +875,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
@@ -1843,4 +1843,4 @@ package-generate:
pkgtrans -s . $(PACKAGE).`arch` $(PACKAGE)
rm -rf $(PACKAGE)
-# DO NOT DELETE THIS LINE -- make depend depends on it. \ No newline at end of file
+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/win/Makefile.in b/win/Makefile.in
index 58a3505..75c0d4f 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.127 2008/05/23 21:00:47 andreas_kupries Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.128 2008/05/23 21:05:14 andreas_kupries Exp $
VERSION = @TCL_VERSION@
@@ -716,8 +716,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