From 130c96273e714020ab719a63c2d62d4a05c372ce Mon Sep 17 00:00:00 2001 From: dgp Date: Tue, 18 Sep 2007 16:07:48 +0000 Subject: * generic/tclStubLib.c: Remove C library calls from Tcl_InitStubs() * win/makefile.vc: so that we don't need the C library linked in to libtclStub. --- ChangeLog | 6 ++++++ generic/tclStubLib.c | 10 ++++++++-- win/makefile.vc | 4 ++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2e17633..acce553 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-09-18 Don Porter + + * generic/tclStubLib.c: Remove C library calls from Tcl_InitStubs() + * win/makefile.vc: so that we don't need the C library linked + in to libtclStub. + 2007-09-17 Pat Thoyts * win/makefile.vc: Add crt flags for tclStubLib now it uses diff --git a/generic/tclStubLib.c b/generic/tclStubLib.c index be2a1fa..9fbd848 100644 --- a/generic/tclStubLib.c +++ b/generic/tclStubLib.c @@ -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: tclStubLib.c,v 1.16 2007/09/17 14:50:44 dgp Exp $ + * RCS: @(#) $Id: tclStubLib.c,v 1.17 2007/09/18 16:07:50 dgp Exp $ */ /* @@ -107,7 +107,13 @@ Tcl_InitStubs( count += !isdigit(*p++); } if (count == 1) { - if (0 != strncmp(version, actualVersion, strlen(version))) { + CONST char *q = actualVersion; + + p = version; + while (*p && (*p == *q)) { + p++; q++; + } + if (*p) { return NULL; } } else { diff --git a/win/makefile.vc b/win/makefile.vc index f56c09d..c6e1038 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -12,7 +12,7 @@ # Copyright (c) 2001-2004 David Gravereaux. # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: makefile.vc,v 1.165 2007/09/17 22:34:44 patthoyts Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.166 2007/09/18 16:07:51 dgp Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) @@ -459,7 +459,7 @@ BASE_CFLAGS = $(cflags) $(cdebug) $(crt) $(TCL_INCLUDES) \ -DMP_PREC=4 -Dinline=__inline CON_CFLAGS = $(cflags) $(cdebug) $(crt) -DCONSOLE TCL_CFLAGS = $(BASE_CFLAGS) $(OPTDEFINES) -STUB_CFLAGS = $(cflags) $(cdebug) $(crt) $(OPTDEFINES) +STUB_CFLAGS = $(cflags) $(cdebug) $(OPTDEFINES) #--------------------------------------------------------------------- -- cgit v0.12