summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornijtmans@users.sourceforge.net <jan.nijtmans>2013-06-06 09:44:46 (GMT)
committernijtmans@users.sourceforge.net <jan.nijtmans>2013-06-06 09:44:46 (GMT)
commita0a2a50d08eac8dad3701648bc64160d8318930d (patch)
treeb5c1e2571260ad8a4f0621dde95e84eb5e953824
parentc15faf509f653bddf20c1cdd26ab6e7be4a4dc84 (diff)
downloadtk-a0a2a50d08eac8dad3701648bc64160d8318930d.zip
tk-a0a2a50d08eac8dad3701648bc64160d8318930d.tar.gz
tk-a0a2a50d08eac8dad3701648bc64160d8318930d.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 *);