summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-06-06 09:44:46 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-06-06 09:44:46 (GMT)
commit1e4a83626695d4ebb409651450c8f9a501edc75d (patch)
tree10ee25125123b24103c9b0cc6cb64995fe102c4c
parentd9a44369370d90d1b8dfd0decd866879a62715f6 (diff)
downloadtk-1e4a83626695d4ebb409651450c8f9a501edc75d.zip
tk-1e4a83626695d4ebb409651450c8f9a501edc75d.tar.gz
tk-1e4a83626695d4ebb409651450c8f9a501edc75d.tar.bz2
Add support for X11 GUI-mode on Cygwin64
-rw-r--r--generic/tkMain.c2
-rw-r--r--generic/tkWindow.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/generic/tkMain.c b/generic/tkMain.c
index 5d58932..00ac165 100644
--- a/generic/tkMain.c
+++ b/generic/tkMain.c
@@ -143,7 +143,7 @@ Tk_MainEx(
}
}
-#if defined(__WIN32__) && !defined(__WIN64__) && !defined(STATIC_BUILD)
+#if defined(__WIN32__) && !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 04d2639..f2e98e8 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.c
@@ -2831,7 +2831,7 @@ DeleteWindowsExitProc(
tsdPtr->initialized = 0;
}
-#if defined(__WIN32__) && !defined(__WIN64__)
+#if defined(__WIN32__)
static HMODULE tkcygwindll = NULL;
@@ -2903,7 +2903,7 @@ int
Tk_Init(
Tcl_Interp *interp) /* Interpreter to initialize. */
{
-#if defined(__WIN32__) && !defined(__WIN64__)
+#if defined(__WIN32__)
if (tkcygwindll) {
int (*sym)(Tcl_Interp *);
@@ -2976,7 +2976,7 @@ Tk_SafeInit(
* checked at several places to differentiate the two initialisations.
*/
-#if defined(__WIN32__) && !defined(__WIN64__)
+#if defined(__WIN32__)
if (tkcygwindll) {
int (*sym)(Tcl_Interp *);