diff options
Diffstat (limited to 'generic')
-rw-r--r-- | generic/tkMain.c | 2 | ||||
-rw-r--r-- | generic/tkStubInit.c | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/generic/tkMain.c b/generic/tkMain.c index 99caf27..3be7189 100644 --- a/generic/tkMain.c +++ b/generic/tkMain.c @@ -24,6 +24,7 @@ #include "tkMacOSXInt.h" #endif +extern int TkCygwinMainEx(int, char **, Tcl_AppInitProc *, Tcl_Interp *); typedef struct ThreadSpecificData { Tcl_Interp *interp; /* Interpreter for this thread. */ @@ -140,7 +141,6 @@ Tk_MainEx( } #if defined(__WIN32__) && !defined(__WIN64__) && !defined(STATIC_BUILD) - extern int TkCygwinMainEx(int, char **, Tcl_AppInitProc *, Tcl_Interp *); if (tclStubsPtr->reserved9) { /* We are running win32 Tk under Cygwin, so let's check diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index 342994a..477e5d8c 100644 --- a/generic/tkStubInit.c +++ b/generic/tkStubInit.c @@ -202,7 +202,7 @@ void TkSubtractRegion (TkRegion a, TkRegion b, TkRegion c) # define TkWinGetPlatformTheme 0 # define TkWinChildProc 0 -# elif !defined(MAC_TCL) && !defined(MAC_OSX_TK) /* UNIX */ +# elif !defined(MAC_OSX_TK) /* UNIX */ # undef TkClipBox # undef TkCreateRegion @@ -213,14 +213,14 @@ void TkSubtractRegion (TkRegion a, TkRegion b, TkRegion c) # undef TkUnionRectWithRegion # undef TkSubtractRegion -# define TkClipBox (void (*) _ANSI_ARGS_((TkRegion, XRectangle *))) XClipBox +# define TkClipBox (void (*) (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 +# define TkDestroyRegion (void (*) (TkRegion)) XDestroyRegion +# define TkIntersectRegion (void (*) (TkRegion, TkRegion, TkRegion)) XIntersectRegion +# define TkRectInRegion (int (*) (TkRegion, int, int, unsigned int, unsigned int)) XRectInRegion +# define TkSetRegion (void (*) (Display *, GC, TkRegion)) XSetRegion +# define TkUnionRectWithRegion (void (*) (XRectangle *, TkRegion, TkRegion)) XUnionRectWithRegion +# define TkSubtractRegion (void (*) (TkRegion, TkRegion, TkRegion)) XSubtractRegion # endif #endif /* !__WIN32__ */ |