diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-10-10 14:13:51 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-10-10 14:13:51 (GMT) |
| commit | 43a91548b31101b95bc2b2e29ada872bb3d9590e (patch) | |
| tree | 7ddd3ac3bd4d9125f2a44ce67d4d5bb7a4540013 /generic | |
| parent | b01e1efe400bfde2a54d1fcc2e40b804b8b1b3ea (diff) | |
| download | tcl-43a91548b31101b95bc2b2e29ada872bb3d9590e.zip tcl-43a91548b31101b95bc2b2e29ada872bb3d9590e.tar.gz tcl-43a91548b31101b95bc2b2e29ada872bb3d9590e.tar.bz2 | |
Fix for bug [f51efe99a7]: MinGW build fails on current checkin. And a new test-case which makes the problem visible on UNIX as well.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclOO.h | 5 | ||||
| -rw-r--r-- | generic/tclOODecls.h | 2 | ||||
| -rw-r--r-- | generic/tclOOStubLib.c | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/generic/tclOO.h b/generic/tclOO.h index 41be168..a6e8a22 100644 --- a/generic/tclOO.h +++ b/generic/tclOO.h @@ -37,13 +37,12 @@ extern "C" { #endif -#if (defined(USE_TCLOO_STUBS) || defined(USE_TCL_STUBS)) extern const char *TclOOInitializeStubs( Tcl_Interp *, const char *version); #define Tcl_OOInitStubs(interp) \ TclOOInitializeStubs((interp), TCLOO_VERSION) -#else -#define Tcl_OOInitStubs(interp) (TCLOO_PATCHLEVEL) +#ifndef USE_TCL_STUBS +# define TclOOInitializeStubs(interp, version) (TCLOO_PATCHLEVEL) #endif /* diff --git a/generic/tclOODecls.h b/generic/tclOODecls.h index c2a5615..e483df6 100644 --- a/generic/tclOODecls.h +++ b/generic/tclOODecls.h @@ -10,6 +10,8 @@ # define TCL_STORAGE_CLASS DLLEXPORT #else # ifdef USE_TCL_STUBS +# undef USE_TCLOO_STUBS +# define USE_TCLOO_STUBS # define TCL_STORAGE_CLASS # else # define TCL_STORAGE_CLASS DLLIMPORT diff --git a/generic/tclOOStubLib.c b/generic/tclOOStubLib.c index 921aced..a9fa212 100644 --- a/generic/tclOOStubLib.c +++ b/generic/tclOOStubLib.c @@ -27,6 +27,8 @@ const TclOOIntStubs *tclOOIntStubsPtr = NULL; *---------------------------------------------------------------------- */ +#undef TclOOInitializeStubs + MODULE_SCOPE const char * TclOOInitializeStubs( Tcl_Interp *interp, |