diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2012-05-29 13:29:51 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2012-05-29 13:29:51 (GMT) |
| commit | c9b81d88741dc175b61b47fd0086e96ad479dcb5 (patch) | |
| tree | 63b8fdc7afe118370cb64a5c408bcbc87370a8fc | |
| parent | b4af65b9b3806189bdeb7f8abea1a1490fff67c4 (diff) | |
| download | tk-c9b81d88741dc175b61b47fd0086e96ad479dcb5.zip tk-c9b81d88741dc175b61b47fd0086e96ad479dcb5.tar.gz tk-c9b81d88741dc175b61b47fd0086e96ad479dcb5.tar.bz2 | |
Unbreak the OSX build
| -rw-r--r-- | generic/tkIntXlibDecls.h | 6 | ||||
| -rw-r--r-- | generic/tkStubInit.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h index a55ee53..bd899bf 100644 --- a/generic/tkIntXlibDecls.h +++ b/generic/tkIntXlibDecls.h @@ -36,7 +36,7 @@ * Exported function declarations: */ -#if defined(__WIN32__) /* WIN */ +#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */ /* 0 */ EXTERN void XSetDashes(Display *display, GC gc, int dash_offset, _Xconst char *dash_list, int n); @@ -602,7 +602,7 @@ typedef struct TkIntXlibStubs { int magic; const struct TkIntXlibStubHooks *hooks; -#if defined(__WIN32__) /* WIN */ +#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */ void (*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 */ @@ -821,7 +821,7 @@ extern const TkIntXlibStubs *tkIntXlibStubsPtr; * Inline function declarations: */ -#if defined(__WIN32__) /* WIN */ +#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */ #define XSetDashes \ (tkIntXlibStubsPtr->xSetDashes) /* 0 */ #define XGetModifierMapping \ diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index 6ba0bda..66b1b80 100644 --- a/generic/tkStubInit.c +++ b/generic/tkStubInit.c @@ -201,7 +201,7 @@ void TkSubtractRegion (TkRegion a, TkRegion b, TkRegion c) # define TkWinGetPlatformTheme 0 # define TkWinChildProc 0 -#elif !defined(MAC_OSC_TK) /* UNIX */ +#elif !defined(MAC_OSX_TK) /* UNIX */ # undef TkClipBox # undef TkCreateRegion @@ -577,7 +577,7 @@ static const TkIntPlatStubs tkIntPlatStubs = { static const TkIntXlibStubs tkIntXlibStubs = { TCL_STUB_MAGIC, 0, -#if defined(__WIN32__) /* WIN */ +#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */ XSetDashes, /* 0 */ XGetModifierMapping, /* 1 */ XCreateImage, /* 2 */ |