diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-06-06 10:00:53 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-06-06 10:00:53 (GMT) |
| commit | a228699e426cb507a09563efde53cdc44f325b65 (patch) | |
| tree | ce24596974d92934c9f2a29deb5760be76b85d35 | |
| parent | ca692c25e794ecf3331faf24768f69a838b32900 (diff) | |
| parent | 9f5c2a4ffa842e4ce9637198de3011ba8d78e7f1 (diff) | |
| download | tk-a228699e426cb507a09563efde53cdc44f325b65.zip tk-a228699e426cb507a09563efde53cdc44f325b65.tar.gz tk-a228699e426cb507a09563efde53cdc44f325b65.tar.bz2 | |
Add support for X11 GUI-mode on Cygwin64
| -rw-r--r-- | generic/tkMain.c | 2 | ||||
| -rw-r--r-- | generic/tkWindow.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/generic/tkMain.c b/generic/tkMain.c index 9210dd1..9d12693 100644 --- a/generic/tkMain.c +++ b/generic/tkMain.c @@ -195,7 +195,7 @@ Tk_MainEx( } } -#if defined(__WIN32__) && !defined(__WIN64__) && !defined(UNICODE) && !defined(STATIC_BUILD) +#if defined(__WIN32__) && !defined(UNICODE) && !defined(STATIC_BUILD) if (tclStubsPtr->reserved9) { /* We are running win32 Tk under Cygwin, so let's check diff --git a/generic/tkWindow.c b/generic/tkWindow.c index 734e7be..91806cf 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -2852,7 +2852,7 @@ DeleteWindowsExitProc( tsdPtr->initialized = 0; } -#if defined(__WIN32__) && !defined(__WIN64__) +#if defined(__WIN32__) static HMODULE tkcygwindll = NULL; @@ -2898,7 +2898,7 @@ TkCygwinMainEx( tkmainex(argc, argv, appInitProc, interp); return 1; } -#endif /* __WIN32__ && !__WIN64__ */ +#endif /* __WIN32__ */ /* *---------------------------------------------------------------------- @@ -2927,7 +2927,7 @@ int Tk_Init( Tcl_Interp *interp) /* Interpreter to initialize. */ { -#if defined(__WIN32__) && !defined(__WIN64__) +#if defined(__WIN32__) if (tkcygwindll) { int (*tkinit)(Tcl_Interp *); @@ -2936,7 +2936,7 @@ Tk_Init( return tkinit(interp); } } -#endif /* __WIN32__ && !__WIN64__ */ +#endif /* __WIN32__ */ return Initialize(interp); } @@ -3000,7 +3000,7 @@ Tk_SafeInit( * checked at several places to differentiate the two initialisations. */ -#if defined(__WIN32__) && !defined(__WIN64__) +#if defined(__WIN32__) if (tkcygwindll) { int (*tksafeinit)(Tcl_Interp *); @@ -3010,7 +3010,7 @@ Tk_SafeInit( return tksafeinit(interp); } } -#endif /* __WIN32__ && !__WIN64__ */ +#endif /* __WIN32__ */ return Initialize(interp); } |