diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | generic/tk.decls | 3 | ||||
| -rw-r--r-- | generic/tkInt.decls | 3 | ||||
| -rw-r--r-- | generic/tkStubInit.c | 8 |
4 files changed, 14 insertions, 3 deletions
@@ -2,6 +2,9 @@ * win/tkWinSend.c: [Bug 3076671] CVS HEAD Tk build fails on win32 with msys/mingw. Make it compile on older mingw as well. + * generic/tk.decls: Add explicit scspec "EXTERN", as in Tcl + * generic/tkInt.decls: + * generic/tkStubInit.c: Don't let Tk_MainEx macro disturb compilation 2010-09-23 Jan Nijtmans <nijtmans@users.sf.net> diff --git a/generic/tk.decls b/generic/tk.decls index 415fead..f33200a 100644 --- a/generic/tk.decls +++ b/generic/tk.decls @@ -11,7 +11,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: tk.decls,v 1.54 2010/09/20 21:18:22 nijtmans Exp $ +# RCS: @(#) $Id: tk.decls,v 1.55 2010/09/28 10:42:05 nijtmans Exp $ library tk @@ -22,6 +22,7 @@ library tk interface tk hooks {tkPlat tkInt tkIntPlat tkIntXlib} +scspec EXTERN # Declare each of the functions in the public Tk interface. Note that # the an index should never be reused for a different function in order diff --git a/generic/tkInt.decls b/generic/tkInt.decls index 7f7d34e..e545da7 100644 --- a/generic/tkInt.decls +++ b/generic/tkInt.decls @@ -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: tkInt.decls,v 1.64 2010/09/20 21:18:22 nijtmans Exp $ +# RCS: @(#) $Id: tkInt.decls,v 1.65 2010/09/28 10:42:05 nijtmans Exp $ library tk @@ -19,6 +19,7 @@ library tk # Define the unsupported generic interfaces. interface tkInt +scspec EXTERN # Declare each of the functions in the unsupported internal Tcl interface. # These interfaces are allowed to changed between versions. Use at your own diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index 0bf6634..7ba1353 100644 --- a/generic/tkStubInit.c +++ b/generic/tkStubInit.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkStubInit.c,v 1.76 2010/08/21 16:35:34 nijtmans Exp $ + * RCS: @(#) $Id: tkStubInit.c,v 1.77 2010/09/28 10:42:05 nijtmans Exp $ */ #include "tkInt.h" @@ -40,6 +40,12 @@ MODULE_SCOPE const TkStubs tkStubs; +/* + * Remove macro that might interfere with the definition below. + */ + +#undef Tk_MainEx + /* !BEGIN!: Do not edit below this line. */ static const TkIntStubs tkIntStubs = { |