diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-15 22:26:51 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-15 22:26:51 (GMT) |
| commit | ab674a5768b77e4a184a509ebbfe09f95a159876 (patch) | |
| tree | be4e53f3dcbb381bd5a3befe210e973588970568 /generic | |
| parent | f99b5fe83fa62c2567c8f52e3d7d3801e1531cba (diff) | |
| parent | 2c3b3f9e49d15b92c67ba934c9503623b466acda (diff) | |
| download | tk-ab674a5768b77e4a184a509ebbfe09f95a159876.zip tk-ab674a5768b77e4a184a509ebbfe09f95a159876.tar.gz tk-ab674a5768b77e4a184a509ebbfe09f95a159876.tar.bz2 | |
Fix [53d03e8f3a]: --disable-shared build against Tcl 9 fails
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkInt.h | 2 | ||||
| -rw-r--r-- | generic/tkStubInit.c | 20 |
2 files changed, 7 insertions, 15 deletions
diff --git a/generic/tkInt.h b/generic/tkInt.h index 0e72161..a5e98c0 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -94,7 +94,7 @@ # define TKFLEXARRAY 1 #endif -#ifndef Tcl_GetParent +#if !defined(Tcl_GetParent) && (TCL_MAJOR_VERSION < 9) && (TCL_MINOR_VERSION < 7) # define Tcl_GetParent Tcl_GetMaster #endif diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index c1151d4..8d863c1 100644 --- a/generic/tkStubInit.c +++ b/generic/tkStubInit.c @@ -59,6 +59,12 @@ static int TkWinGetPlatformId(void) { # define TkWinGetPlatformId 0 #endif +static int +doNothing(void) +{ + /* dummy implementation, no need to do anything */ + return 0; +} #if defined(TK_NO_DEPRECATED) || TCL_MAJOR_VERSION > 8 #define Tk_MainEx 0 @@ -73,21 +79,7 @@ static int TkWinGetPlatformId(void) { #define Tk_PhotoPutZoomedBlock_Panic 0 #define Tk_PhotoSetSize_Panic 0 #define Tk_CreateOldPhotoImageFormat 0 -#ifdef MAC_OSX_TK -static int -doNothing(void) -{ - /* dummy implementation, no need to do anything */ - return 0; -} -#endif #else -static int -doNothing(void) -{ - /* dummy implementation, no need to do anything */ - return 0; -} #define Tk_FreeXId ((void (*)(Display *, XID))(void *)doNothing) #define Tk_FreeStyleFromObj ((void (*)(Tcl_Obj *))(void *)doNothing) #define Tk_GetStyleFromObj getStyleFromObj |