diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-09-21 09:28:39 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-09-21 09:28:39 (GMT) |
| commit | 8d3c0c2e8152a4ce95d5f96680dca034fcfa0b6b (patch) | |
| tree | 6b4c3d835846d4c615f17c627e2bd3fc15b4dec3 | |
| parent | e7e4c74b7fb66e778876342cd605a50caee31646 (diff) | |
| parent | 3adfe07f74e75d5e64032044c4a5bfa611777e44 (diff) | |
| download | tcl-8d3c0c2e8152a4ce95d5f96680dca034fcfa0b6b.zip tcl-8d3c0c2e8152a4ce95d5f96680dca034fcfa0b6b.tar.gz tcl-8d3c0c2e8152a4ce95d5f96680dca034fcfa0b6b.tar.bz2 | |
Merge core-8-6-branch. Add more comments to tclLiteral.c, contributed by mr_calvin
| -rw-r--r-- | generic/tclLiteral.c | 9 | ||||
| -rw-r--r-- | win/Makefile.in | 2 | ||||
| -rw-r--r-- | win/rules.vc | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/generic/tclLiteral.c b/generic/tclLiteral.c index 49f21f2..7acc9ad 100644 --- a/generic/tclLiteral.c +++ b/generic/tclLiteral.c @@ -229,8 +229,7 @@ TclCreateLiteral( } /* - * The literal is new to the interpreter. Add it to the global literal - * table. + * The literal is new to the interpreter. */ TclNewObj(objPtr); @@ -241,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) { @@ -251,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", diff --git a/win/Makefile.in b/win/Makefile.in index 28ffe0a..066e6b1 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/rules.vc b/win/rules.vc index d4c2f35..30e8c2f 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]
|