diff options
| author | dgp <dgp@users.sourceforge.net> | 2012-12-10 18:45:42 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2012-12-10 18:45:42 (GMT) |
| commit | 90307605832ae8bf5cd7ec028c9b485fbdfe77d7 (patch) | |
| tree | 708644ff66f62bbb8adc9c3338fa0904b67d0809 /generic | |
| parent | fddfcf8aea5231055a00f5d969533085b36b8347 (diff) | |
| download | tk-90307605832ae8bf5cd7ec028c9b485fbdfe77d7.zip tk-90307605832ae8bf5cd7ec028c9b485fbdfe77d7.tar.gz tk-90307605832ae8bf5cd7ec028c9b485fbdfe77d7.tar.bz2 | |
Set of changes that permits Tk 8.5.14 to build against the released
header files of Tcl 8.6.0. Developed and tested only on linux so far.
A step in the saga to decouple Tcl and Tk releases.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tk.h | 10 | ||||
| -rw-r--r-- | generic/tkWindow.c | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/generic/tk.h b/generic/tk.h index 8c13df2..3d20e02 100644 --- a/generic/tk.h +++ b/generic/tk.h @@ -17,10 +17,18 @@ #define _TK #include <tcl.h> -#if (TCL_MAJOR_VERSION != 8) || (TCL_MINOR_VERSION != 5) +#if (TCL_MAJOR_VERSION != 8) || (TCL_MINOR_VERSION < 5) # error Tk 8.5 must be compiled with tcl.h from Tcl 8.5 #endif +#ifndef _ANSI_ARGS_ +# ifndef NO_PROTOTYPES +# define _ANSI_ARGS_(x) x +# else +# define _ANSI_ARGS_(x) () +# endif +#endif + /* * For C++ compilers, use extern "C" */ diff --git a/generic/tkWindow.c b/generic/tkWindow.c index 995f71f..79f0ae3 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -3281,9 +3281,11 @@ Initialize( Tcl_SetMainLoop(Tk_MainLoop); +/* #undef Tk_InitStubs Tk_InitStubs(interp, TK_VERSION, 1); +*/ /* * Initialized the themed widget set |