diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-04-03 20:17:01 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-04-03 20:17:01 (GMT) |
| commit | 46aecf3d998cb19bd8107932e7f95cf5abbc41a9 (patch) | |
| tree | 6909766d167011b99ee390e421db7f35904a4f29 | |
| parent | b0cd51815168b6c4d8fa61c00eb931f865ee03ec (diff) | |
| download | tk-46aecf3d998cb19bd8107932e7f95cf5abbc41a9.zip tk-46aecf3d998cb19bd8107932e7f95cf5abbc41a9.tar.gz tk-46aecf3d998cb19bd8107932e7f95cf5abbc41a9.tar.bz2 | |
Remove unused variable.
Remove tkStubLib.o from tk85.dll. On Windows, data cannot be exported from dll's anyway, so it's just dead code. On UNIX, it makes a difference, and it would be a potential incompatibility to remove it.
| -rw-r--r-- | generic/tkCanvUtil.c | 4 | ||||
| -rw-r--r-- | generic/tkWindow.c | 6 | ||||
| -rw-r--r-- | win/Makefile.in | 1 | ||||
| -rw-r--r-- | win/makefile.bc | 1 | ||||
| -rw-r--r-- | win/makefile.vc | 1 |
5 files changed, 8 insertions, 5 deletions
diff --git a/generic/tkCanvUtil.c b/generic/tkCanvUtil.c index eca3789..b4d0c3b 100644 --- a/generic/tkCanvUtil.c +++ b/generic/tkCanvUtil.c @@ -1660,8 +1660,10 @@ TkCanvTranslatePath( double *a, *b, *t; /* Pointers to parts of the temporary * storage */ int i, j; /* Loop counters */ +#ifndef NDEBUG int maxOutput; /* Maximum number of outputs that we will * allow */ +#endif double limit[4]; /* Boundries at which clipping occurs */ double staticSpace[480]; /* Temp space from the stack */ @@ -1756,7 +1758,9 @@ TkCanvTranslatePath( * This is the loop that makes the four passes through the data. */ +#ifndef NDEBUG maxOutput = numVertex*3; +#endif for (j=0; j<4; j++){ double xClip = limit[j]; int inside = a[0]<xClip; diff --git a/generic/tkWindow.c b/generic/tkWindow.c index ac69455..04d2639 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -3275,9 +3275,11 @@ Initialize( Tcl_SetMainLoop(Tk_MainLoop); -#undef Tk_InitStubs - +#ifndef _WIN32 + /* On Windows, this has no added value. */ +# undef Tk_InitStubs Tk_InitStubs(interp, TK_VERSION, 1); +#endif /* * Initialized the themed widget set diff --git a/win/Makefile.in b/win/Makefile.in index 550e6ae..2952e03 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -350,7 +350,6 @@ TK_OBJS = \ tkUtil.$(OBJEXT) \ tkVisual.$(OBJEXT) \ tkStubInit.$(OBJEXT) \ - tkStubLib.$(OBJEXT) \ tkWindow.$(OBJEXT) \ $(TTK_OBJS) diff --git a/win/makefile.bc b/win/makefile.bc index 12fd5b8..295ed23 100644 --- a/win/makefile.bc +++ b/win/makefile.bc @@ -225,7 +225,6 @@ TKOBJS = \ $(TMPDIR)\tkUtil.obj \ $(TMPDIR)\tkVisual.obj \ $(TMPDIR)\tkStubInit.obj \ - $(TMPDIR)\tkStubLib.obj \ $(TMPDIR)\tkWindow.obj # Maintenance hint: Please have multiple members of TKSTUBOBJS be separated diff --git a/win/makefile.vc b/win/makefile.vc index 68df470..a7b0c0a 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -360,7 +360,6 @@ TKOBJS = \ $(TMP_DIR)\tkUtil.obj \ $(TMP_DIR)\tkVisual.obj \ $(TMP_DIR)\tkStubInit.obj \ - $(TMP_DIR)\tkStubLib.obj \ $(TMP_DIR)\tkWindow.obj \ $(TTK_OBJS) \ !if !$(STATIC_BUILD) |