summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-06-06 10:00:53 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-06-06 10:00:53 (GMT)
commitf7ede49ab747459872ca0aa05978a4620fc2f031 (patch)
treece24596974d92934c9f2a29deb5760be76b85d35 /generic
parent060bda7e185c8d85adc2791b6cc059e007db799b (diff)
parent1e4a83626695d4ebb409651450c8f9a501edc75d (diff)
downloadtk-f7ede49ab747459872ca0aa05978a4620fc2f031.zip
tk-f7ede49ab747459872ca0aa05978a4620fc2f031.tar.gz
tk-f7ede49ab747459872ca0aa05978a4620fc2f031.tar.bz2
Add support for X11 GUI-mode on Cygwin64
Diffstat (limited to 'generic')
-rw-r--r--generic/tkMain.c2
-rw-r--r--generic/tkWindow.c12
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);
}