diff options
| author | dgp <dgp@users.sourceforge.net> | 2007-09-18 16:12:17 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2007-09-18 16:12:17 (GMT) |
| commit | 44599189a7685027323fc4cd33c48918d5716ee0 (patch) | |
| tree | 669a623378b5e9d5ce87aa79a2d14a85a0e67b38 | |
| parent | 9796d2d3945b437083d79e6c8e2333aec0b3f577 (diff) | |
| download | tk-44599189a7685027323fc4cd33c48918d5716ee0.zip tk-44599189a7685027323fc4cd33c48918d5716ee0.tar.gz tk-44599189a7685027323fc4cd33c48918d5716ee0.tar.bz2 | |
* generic/tkStubLib.c: Remove C library calls from Tk_InitStubs()
* win/makefile.vc: so that we don't need the C library linked
in to libtkStub.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | generic/tkStubLib.c | 10 | ||||
| -rw-r--r-- | win/makefile.vc | 4 |
3 files changed, 16 insertions, 4 deletions
@@ -1,3 +1,9 @@ +2007-09-18 Don Porter <dgp@users.sourceforge.net> + + * generic/tkStubLib.c: Remove C library calls from Tk_InitStubs() + * win/makefile.vc: so that we don't need the C library linked + in to libtkStub. + 2007-09-18 Donal K. Fellows <donal.k.fellows@man.ac.uk> * generic/tkImgGIF.c (FileReadGIF, StringReadGIF): Rewrite for greater diff --git a/generic/tkStubLib.c b/generic/tkStubLib.c index 6c884c5..aaeba9f 100644 --- a/generic/tkStubLib.c +++ b/generic/tkStubLib.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: tkStubLib.c,v 1.16 2007/09/17 14:58:04 dgp Exp $ + * RCS: @(#) $Id: tkStubLib.c,v 1.17 2007/09/18 16:12:19 dgp Exp $ */ /* @@ -98,7 +98,13 @@ Tk_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 19c29aa..e413fd5 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.106 2007/09/17 22:40:25 patthoyts Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.107 2007/09/18 16:12:19 dgp Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) @@ -470,7 +470,7 @@ BASE_CFLAGS = $(cdebug) $(cflags) $(crt) $(TK_INCLUDES) TK_CFLAGS = $(BASE_CFLAGS) $(TK_DEFINES) -DUSE_TCL_STUBS CON_CFLAGS = $(cdebug) $(cflags) $(crt) -DCONSOLE WISH_CFLAGS = $(BASE_CFLAGS) $(TK_DEFINES) -STUB_CFLAGS = $(cflags) $(cdebug) $(crt) $(TK_DEFINES) +STUB_CFLAGS = $(cflags) $(cdebug) $(TK_DEFINES) #--------------------------------------------------------------------- |