diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-04-30 09:57:37 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-04-30 09:57:37 (GMT) |
| commit | a05abd162d6d3eda86cb3842832225cc89f76864 (patch) | |
| tree | ae7a8e880f13d5a50e59861fdd2d709489b6e9a3 | |
| parent | b62a80af2e19518b7cdaf13d290bf68f45800ef8 (diff) | |
| parent | 682a2025a8557d37fdc00b7644af58ccb725543c (diff) | |
| download | tk-a05abd162d6d3eda86cb3842832225cc89f76864.zip tk-a05abd162d6d3eda86cb3842832225cc89f76864.tar.gz tk-a05abd162d6d3eda86cb3842832225cc89f76864.tar.bz2 | |
Fix --disable-shared build on Windows. Eliminate warning in tkWinTest.c
| -rw-r--r-- | generic/tkWindow.c | 4 | ||||
| -rw-r--r-- | win/tkWinTest.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/generic/tkWindow.c b/generic/tkWindow.c index 8c9d556..a93fed4 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -3018,7 +3018,7 @@ int Tk_Init( Tcl_Interp *interp) /* Interpreter to initialize. */ { -#if defined(_WIN32) +#if defined(_WIN32) && !defined(STATIC_BUILD) if (tkcygwindll) { int (*tkinit)(Tcl_Interp *); @@ -3091,7 +3091,7 @@ Tk_SafeInit( * checked at several places to differentiate the two initialisations. */ -#if defined(_WIN32) +#if defined(_WIN32) && !defined(STATIC_BUILD) if (tkcygwindll) { int (*tksafeinit)(Tcl_Interp *); diff --git a/win/tkWinTest.c b/win/tkWinTest.c index 8f186be..693d1c3 100644 --- a/win/tkWinTest.c +++ b/win/tkWinTest.c @@ -17,6 +17,8 @@ #undef USE_TK_STUBS #define USE_TK_STUBS #include "tkWinInt.h" +#undef TCLBOOLWARNING +#define TCLBOOLWARNING(boolPtr) /* needed here because we compile with -Wc++-compat */ HWND tkWinCurrentDialog; |