diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-05 11:11:21 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-05 11:11:21 (GMT) |
| commit | de76506f536b8af35a1cc81597de6c691e105248 (patch) | |
| tree | e3143d6043d82311b6be00703e45ee0e7f8067dd /generic | |
| parent | bffdf13f31774677807ea594324f7a8964a1ee10 (diff) | |
| download | tk-de76506f536b8af35a1cc81597de6c691e105248.zip tk-de76506f536b8af35a1cc81597de6c691e105248.tar.gz tk-de76506f536b8af35a1cc81597de6c691e105248.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.h | 2 | ||||
| -rw-r--r-- | generic/tkIntXlibDecls.h | 6 | ||||
| -rw-r--r-- | generic/tkStubInit.c | 2 |
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 */ |