diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-25 14:42:24 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-25 14:42:24 (GMT) |
| commit | 6092901c18b64a83b6d7ccb7e4c63679afb801b1 (patch) | |
| tree | 8aa2ac327d779e4a7cb7408bcfb817512bb8c5ea | |
| parent | 83b2a657b13a11a640d2713f031c63a514360f1d (diff) | |
| download | tk-6092901c18b64a83b6d7ccb7e4c63679afb801b1.zip tk-6092901c18b64a83b6d7ccb7e4c63679afb801b1.tar.gz tk-6092901c18b64a83b6d7ccb7e4c63679afb801b1.tar.bz2 | |
this should fix the broken build, not yet tested on Unix
| -rw-r--r-- | generic/tkStubInit.c | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index c526a86..a0ab9e9 100644 --- a/generic/tkStubInit.c +++ b/generic/tkStubInit.c @@ -61,17 +61,6 @@ TkpSync(Display *display) # define TkpTestsendCmd 0 #else -# undef TkClipBox -# undef TkCreateRegion -# undef TkDestroyRegion -# undef TkIntersectRegion -# undef TkRectInRegion -# undef TkSetRegion -# undef TkUnionRectWithRegion -# undef TkSubtractRegion -# undef TkSetPixmapColormap -# undef TkpPrintWindowId -# undef TkWinChildProc /* * Make sure that extensions which call XParseColor through the stub @@ -211,7 +200,28 @@ void TkSubtractRegion (TkRegion a, TkRegion b, TkRegion c) # define TkWinSetHINSTANCE 0 # define TkWinGetPlatformTheme 0 # define TkWinChildProc 0 -# endif /* __CYGWIN__ */ + +#elif !defined(MAC_OSC_TK) /* UNIX */ + +# undef TkClipBox +# undef TkCreateRegion +# undef TkDestroyRegion +# undef TkIntersectRegion +# undef TkRectInRegion +# undef TkSetRegion +# undef TkUnionRectWithRegion +# undef TkSubtractRegion + +# define TkClipBox (void (*) _ANSI_ARGS_((TkRegion, XRectangle *))) XClipBox +# define TkCreateRegion (TkRegion (*) ()) XCreateRegion +# define TkDestroyRegion (void (*) _ANSI_ARGS_((TkRegion))) XDestroyRegion +# define TkIntersectRegion (void (*) _ANSI_ARGS_((TkRegion, TkRegion, TkRegion))) XIntersectRegion +# define TkRectInRegion (int (*) _ANSI_ARGS_((TkRegion, int, int, unsigned int, unsigned int))) XRectInRegion +# define TkSetRegion (void (*) _ANSI_ARGS_((Display *, GC, TkRegion))) XSetRegion +# define TkUnionRectWithRegion (void (*) _ANSI_ARGS_((XRectangle *, TkRegion, TkRegion))) XUnionRectWithRegion +# define TkSubtractRegion (void (*) _ANSI_ARGS_((TkRegion, TkRegion, TkRegion))) XSubtractRegion + +# endif #endif /* !__WIN32__ */ /* |