diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | generic/tclObj.c | 3 | ||||
| -rw-r--r-- | win/makefile.vc | 17 | ||||
| -rw-r--r-- | win/tclAppInit.c | 4 |
4 files changed, 19 insertions, 11 deletions
@@ -1,3 +1,9 @@ +2003-10-09 Pat Thoyts <patthoyts@users.sourceforge.net> + + * win/makefile.vc: Applied patches for bug #801467 by Joe Mistachkin + * win/tclAppInit.c: to fix incompatible TCL_MEM_DEBUG handling in + * generic/tclObj.c: Win32 VC builds. + 2003-10-08 Don Porter <dgp@users.sourceforge.net> * generic/tclBasic.c: Save and restore the iPtr->flag bits that diff --git a/generic/tclObj.c b/generic/tclObj.c index a3f9447..55b7ce8 100644 --- a/generic/tclObj.c +++ b/generic/tclObj.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclObj.c,v 1.50 2003/09/29 14:37:14 dkf Exp $ + * RCS: @(#) $Id: tclObj.c,v 1.51 2003/10/09 00:29:27 patthoyts Exp $ */ #include "tclInt.h" @@ -524,6 +524,7 @@ void TclDbInitNewObj(objPtr) * Add entry to a thread local map used to check if a Tcl_Obj * was allocated by the currently executing thread. */ + if (!TclInExit()) { Tcl_HashEntry *hPtr; Tcl_HashTable *tablePtr; diff --git a/win/makefile.vc b/win/makefile.vc index e993c3c..9f6eca9 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -12,7 +12,7 @@ # Copyright (c) 2001-2002 David Gravereaux. # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: makefile.vc,v 1.110 2003/06/25 23:02:11 dkf Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.111 2003/10/09 00:29:27 patthoyts Exp $ #------------------------------------------------------------------------------ !if "$(MSVCDIR)" == "" @@ -364,10 +364,11 @@ crt = -MT !endif TCL_INCLUDES = -I"$(WINDIR)" -I"$(GENERICDIR)" -BASE_CLFAGS = $(cflags) $(cdebug) $(crt) $(TCL_INCLUDES) \ +BASE_CFLAGS = $(cflags) $(cdebug) $(crt) $(TCL_INCLUDES) \ -DTCL_PIPE_DLL=\"$(TCLPIPEDLLNAME)\" CON_CFLAGS = $(cflags) $(cdebug) $(crt) -DCONSOLE -TCL_CFLAGS = $(BASE_CLFAGS) $(OPTDEFINES) +TCL_CFLAGS = $(BASE_CFLAGS) $(OPTDEFINES) +STUB_CFLAGS = $(cflags) $(cdebug) $(OPTDEFINES) #--------------------------------------------------------------------- @@ -648,17 +649,17 @@ $(TMP_DIR)\tclAppInit.obj: $(WINDIR)\tclAppInit.c $(TMP_DIR)\tclWinReg.obj: $(WINDIR)\tclWinReg.c !if $(STATIC_BUILD) - $(cc32) $(BASE_CLFAGS) -DTCL_THREADS=1 -DSTATIC_BUILD -Fo$@ $? + $(cc32) $(TCL_CFLAGS) -DTCL_THREADS=1 -DSTATIC_BUILD -Fo$@ $? !else - $(cc32) $(BASE_CLFAGS) -DTCL_THREADS=1 -DUSE_TCL_STUBS -Fo$@ $? + $(cc32) $(TCL_CFLAGS) -DTCL_THREADS=1 -DUSE_TCL_STUBS -Fo$@ $? !endif $(TMP_DIR)\tclWinDde.obj: $(WINDIR)\tclWinDde.c !if $(STATIC_BUILD) - $(cc32) $(BASE_CLFAGS) -DTCL_THREADS=1 -DSTATIC_BUILD -Fo$@ $? + $(cc32) $(TCL_CFLAGS) -DTCL_THREADS=1 -DSTATIC_BUILD -Fo$@ $? !else - $(cc32) $(BASE_CLFAGS) -DTCL_THREADS=1 -DUSE_TCL_STUBS -Fo$@ $? + $(cc32) $(TCL_CFLAGS) -DTCL_THREADS=1 -DUSE_TCL_STUBS -Fo$@ $? !endif @@ -667,7 +668,7 @@ $(TMP_DIR)\tclWinDde.obj: $(WINDIR)\tclWinDde.c ### specific c-runtime. $(TMP_DIR)\tclStubLib.obj: $(GENERICDIR)\tclStubLib.c - $(cc32) $(cflags) $(cdebug) -Zl -DSTATIC_BUILD $(TCL_INCLUDES) -Fo$@ $? + $(cc32) $(STUB_CFLAGS) -Zl -DSTATIC_BUILD $(TCL_INCLUDES) -Fo$@ $? #--------------------------------------------------------------------- diff --git a/win/tclAppInit.c b/win/tclAppInit.c index 19acfe0..16d488b 100644 --- a/win/tclAppInit.c +++ b/win/tclAppInit.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclAppInit.c,v 1.13 2003/05/10 04:25:49 mistachkin Exp $ + * RCS: @(#) $Id: tclAppInit.c,v 1.14 2003/10/09 00:29:27 patthoyts Exp $ */ #include "tcl.h" @@ -315,7 +315,7 @@ setargv(argcPtr, argvPtr) } } } - argSpace = (char *) Tcl_Alloc( + argSpace = (char *) ckalloc( (unsigned) (size * sizeof(char *) + strlen(cmdLine) + 1)); argv = (char **) argSpace; argSpace += size * sizeof(char *); |