summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authornijtmans@users.sourceforge.net <jan.nijtmans>2012-06-05 11:11:21 (GMT)
committernijtmans@users.sourceforge.net <jan.nijtmans>2012-06-05 11:11:21 (GMT)
commit4d20f665946c27cd45eb210ffd754af25bc4688f (patch)
treee3143d6043d82311b6be00703e45ee0e7f8067dd /generic
parent01005ac615a6454ce1868948bf3757b1b45548c5 (diff)
downloadtk-4d20f665946c27cd45eb210ffd754af25bc4688f.zip
tk-4d20f665946c27cd45eb210ffd754af25bc4688f.tar.gz
tk-4d20f665946c27cd45eb210ffd754af25bc4688f.tar.bz2
Generate same pkgIndex.tcl file for win32 and cygwin, one that is equally useable for both
Diffstat (limited to 'generic')
-rw-r--r--generic/tkIntDecls.h2
-rw-r--r--generic/tkIntXlibDecls.h6
-rw-r--r--generic/tkStubInit.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h
index eb224c8..59e7e30 100644
--- a/generic/tkIntDecls.h
+++ b/generic/tkIntDecls.h
@@ -1854,7 +1854,7 @@ extern TkIntStubs *tkIntStubsPtr;
#undef TCL_STORAGE_CLASS
#define TCL_STORAGE_CLASS DLLIMPORT
-#if !defined(__WIN32__) && !defined(MAC_OSX_TK)
+#if !defined(__WIN32__) && !defined(__CYGWIN__) && !defined(MAC_OSX_TK)
/*
* These macros are just wrappers for the equivalent X Region calls.
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index 0e59123..5f1b3ad 100644
--- a/generic/tkIntXlibDecls.h
+++ b/generic/tkIntXlibDecls.h
@@ -32,7 +32,7 @@
* Exported function declarations:
*/
-#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
+#if defined(__WIN32__) /* WIN */
#ifndef XSetDashes_TCL_DECLARED
#define XSetDashes_TCL_DECLARED
/* 0 */
@@ -1192,7 +1192,7 @@ typedef struct TkIntXlibStubs {
int magic;
struct TkIntXlibStubHooks *hooks;
-#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
+#if defined(__WIN32__) /* WIN */
int (*xSetDashes) (Display *display, GC gc, int dash_offset, _Xconst char *dash_list, int n); /* 0 */
XModifierKeymap * (*xGetModifierMapping) (Display *d); /* 1 */
XImage * (*xCreateImage) (Display *d, Visual *v, unsigned int ui1, int i1, int i2, char *cp, unsigned int ui2, unsigned int ui3, int i3, int i4); /* 2 */
@@ -1411,7 +1411,7 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr;
* Inline function declarations:
*/
-#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
+#if defined(__WIN32__) /* WIN */
#ifndef XSetDashes
#define XSetDashes \
(tkIntXlibStubsPtr->xSetDashes) /* 0 */
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 342994a..42bb3f1 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -573,7 +573,7 @@ TkIntPlatStubs tkIntPlatStubs = {
TkIntXlibStubs tkIntXlibStubs = {
TCL_STUB_MAGIC,
NULL,
-#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
+#if defined(__WIN32__) /* WIN */
XSetDashes, /* 0 */
XGetModifierMapping, /* 1 */
XCreateImage, /* 2 */