Pulling change from trunk

4 files changed, 26 insertions, 14 deletions

diff --git a/generic/tclLiteral.c b/generic/tclLiteral.c
index 9922cec..7acc9ad 100644
--- a/generic/tclLiteral.c
+++ b/generic/tclLiteral.c
@@ -229,12 +229,10 @@ TclCreateLiteral(
     }
 
     /*
-     * The literal is new to the interpreter. Add it to the global literal
-     * table.
+     * The literal is new to the interpreter.
      */
 
     TclNewObj(objPtr);
-    Tcl_IncrRefCount(objPtr);
     if ((flags & LITERAL_ON_HEAP)) {
 	objPtr->bytes = (char *) bytes;
 	objPtr->length = length;
@@ -242,8 +240,11 @@ TclCreateLiteral(
 	TclInitStringRep(objPtr, bytes, length);
     }
 
+    /* Should the new literal be shared globally? */
+
     if ((flags & LITERAL_UNSHARED)) {
 	/*
+	 * No, do *not* add it the global literal table
 	 * Make clear, that no global value is returned
 	 */
 	if (globalPtrPtr != NULL) {
@@ -252,6 +253,9 @@ TclCreateLiteral(
 	return objPtr;
     }
 
+    /*
+     * Yes, add it to the global literal table.
+     */
 #ifdef TCL_COMPILE_DEBUG
     if (LookupLiteralEntry((Tcl_Interp *) iPtr, objPtr) != NULL) {
 	Tcl_Panic("%s: literal \"%.*s\" found globally but shouldn't be",
@@ -261,6 +265,7 @@ TclCreateLiteral(
 
     globalPtr = ckalloc(sizeof(LiteralEntry));
     globalPtr->objPtr = objPtr;
+    Tcl_IncrRefCount(objPtr);
     globalPtr->refCount = 1;
     globalPtr->nsPtr = nsPtr;
     globalPtr->nextPtr = globalTablePtr->buckets[globalHash];
diff --git a/win/Makefile.in b/win/Makefile.in
index 118ccb1..7e371c8 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -81,7 +81,7 @@ CFLAGS_OPTIMIZE	= @CFLAGS_OPTIMIZE@
 #CFLAGS = 		$(CFLAGS_DEBUG)
 #CFLAGS = 		$(CFLAGS_OPTIMIZE)
 #CFLAGS = 		$(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
-CFLAGS = 		@CFLAGS@ @CFLAGS_DEFAULT@ -DUNICODE -D_UNICODE
+CFLAGS = 		@CFLAGS@ @CFLAGS_DEFAULT@ -DUNICODE -D_UNICODE -D_ATL_XP_TARGETING
 
 # To compile without backward compatibility and deprecated code uncomment the
 # following
diff --git a/win/makefile.vc b/win/makefile.vc
index cf7d422..d360e67 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -738,7 +738,7 @@ gentommath_h:
 !ifndef HHC

 HHC=""%ProgramFiles%\HTML Help Workshop\hhc.exe""

 !endif

-HTMLDIR=$(ROOT)\html

+HTMLDIR=$(OUT_DIR)\html

 HTMLBASE=TclTk$(VERSION)

 HHPFILE=$(HTMLDIR)\$(HTMLBASE).hhp

 CHMFILE=$(HTMLDIR)\$(HTMLBASE).chm

@@ -746,25 +746,27 @@ CHMFILE=$(HTMLDIR)\$(HTMLBASE).chm
 htmlhelp: chmsetup $(CHMFILE)

 

 $(CHMFILE): $(DOCDIR)\*

-	@$(TCLSH) $(TOOLSDIR)\tcltk-man2html.tcl

+	@$(TCLSH) $(TOOLSDIR)\tcltk-man2html.tcl "--htmldir=$(HTMLDIR)"

 	@echo Compiling HTML help project

-	@$(HHC) <<$(HHPFILE) >NUL

+	-$(HHC) <<$(HHPFILE) >NUL

 [OPTIONS]

 Compatibility=1.1 or later

 Compiled file=$(HTMLBASE).chm

+Default topic=contents.htm

 Display compile progress=no

 Error log file=$(HTMLBASE).log

+Full-text search=Yes

 Language=0x409 English (United States)

 Title=Tcl/Tk $(DOT_VERSION) Help

 [FILES]

 contents.htm

 docs.css

-Keywords

-TclCmd

-TclLib

-TkCmd

-TkLib

-UserCmd

+Keywords\*.htm

+TclCmd\*.htm

+TclLib\*.htm

+TkCmd\*.htm

+TkLib\*.htm

+UserCmd\*.htm

 <<

 

 chmsetup:

diff --git a/win/rules.vc b/win/rules.vc
index d4c2f35..e12854d 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -159,7 +159,7 @@ DEBUGFLAGS     = $(DEBUGFLAGS) -RTC1
 DEBUGFLAGS     = $(DEBUGFLAGS) -GZ

 !endif

 

-COMPILERFLAGS  =-W3 -DUNICODE -D_UNICODE

+COMPILERFLAGS  =-W3 /DUNICODE /D_UNICODE /D_ATL_XP_TARGETING

 

 # In v13 -GL and -YX are incompatible.

 !if [nmakehlp -c -YX]

@@ -230,6 +230,10 @@ STATIC_BUILD	= 1
 !else

 STATIC_BUILD	= 0

 !endif

+!if [nmakehlp -f $(OPTS) "nomsvcrt"]

+!message *** Doing nomsvcrt

+MSVCRT		= 0

+!else

 !if [nmakehlp -f $(OPTS) "msvcrt"]

 !message *** Doing msvcrt

 MSVCRT		= 1

@@ -240,6 +244,7 @@ MSVCRT		= 1
 MSVCRT		= 0

 !endif

 !endif

+!endif

 !if [nmakehlp -f $(OPTS) "staticpkg"] && $(STATIC_BUILD)

 !message *** Doing staticpkg

 TCL_USE_STATIC_PACKAGES	= 1