diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-08 14:01:03 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-08 14:01:03 (GMT) |
| commit | 02e32eb2321a8c8756a8445c2bd45d62ca053e76 (patch) | |
| tree | 44dd422d3587bbe88642726b52a27eb8d8278c3f /generic | |
| parent | 627528287a3e418209bf5d940d4920c52d3be9f6 (diff) | |
| parent | 95aa66aaac53bd1a8b29fd542ec754556343c7a9 (diff) | |
| download | tk-02e32eb2321a8c8756a8445c2bd45d62ca053e76.zip tk-02e32eb2321a8c8756a8445c2bd45d62ca053e76.tar.gz tk-02e32eb2321a8c8756a8445c2bd45d62ca053e76.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkStubInit.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index bdcc4ae..7adf4c2 100644 --- a/generic/tkStubInit.c +++ b/generic/tkStubInit.c @@ -74,18 +74,19 @@ static int TkWinGetPlatformId(void) { #define Tk_PhotoSetSize_Panic 0 #define Tk_CreateOldPhotoImageFormat 0 #ifdef MAC_OSX_TK -static void +static int doNothing(void) { /* dummy implementation, no need to do anything */ + return 0; } #endif #else -static void * +static int doNothing(void) { /* dummy implementation, no need to do anything */ - return NULL; + return 0; } #define Tk_FreeXId ((void (*)(Display *, XID))(void *)doNothing) #define Tk_FreeStyleFromObj ((void (*)(Tcl_Obj *))(void *)doNothing) |