diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-03-28 07:36:44 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-03-28 07:36:44 (GMT) |
| commit | 0198f40eb58a938f901dac686a48e9635c8d1156 (patch) | |
| tree | 209d2a079e30e4becaca7dbdbdc4f8575328eb14 /generic | |
| parent | d2775095f0bf50afa0506eca7153d42d0667806a (diff) | |
| download | tk-0198f40eb58a938f901dac686a48e9635c8d1156.zip tk-0198f40eb58a938f901dac686a48e9635c8d1156.tar.gz tk-0198f40eb58a938f901dac686a48e9635c8d1156.tar.bz2 | |
Easier solution, with proper protection and configure warnings.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkCmds.c | 7 | ||||
| -rw-r--r-- | generic/tkMain.c | 2 | ||||
| -rw-r--r-- | generic/tkWindow.c | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/generic/tkCmds.c b/generic/tkCmds.c index 09c1d67..a655341 100644 --- a/generic/tkCmds.c +++ b/generic/tkCmds.c @@ -23,12 +23,7 @@ #endif #if (TCL_MAJOR_VERSION==8) && (TCL_MINOR_VERSION<6) -# if defined(STATIC_BUILD) -# define Tcl_Canceled(interp, flags) (TCL_OK) -# else -# define Tcl_Canceled \ - (tclStubsPtr->tclCanceled) /* 581 */ -# endif +# define Tcl_Canceled(interp, flags) (TCL_OK) #endif /* diff --git a/generic/tkMain.c b/generic/tkMain.c index cb1fb5e..8bebb3d 100644 --- a/generic/tkMain.c +++ b/generic/tkMain.c @@ -135,7 +135,7 @@ Tk_MainEx( * Ensure that we are getting a compatible version of Tcl. */ - if (Tcl_InitStubs(interp, "8.5.0", 0) == NULL) { + if (Tcl_InitStubs(interp, TCL_VERSION ".0", 0) == NULL) { if (Tcl_InitStubs(interp, "8.1", 0) == NULL) { abort(); } else { diff --git a/generic/tkWindow.c b/generic/tkWindow.c index 2901256..d40e7de 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -3024,7 +3024,7 @@ Initialize( * Ensure that we are getting a compatible version of Tcl. */ - if (Tcl_InitStubs(interp, "8.5.0", 0) == NULL) { + if (Tcl_InitStubs(interp, TCL_VERSION ".0", 0) == NULL) { return TCL_ERROR; } |