diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-08 22:19:46 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-08 22:19:46 (GMT) |
| commit | d965535fda1022e02c618349271e8ec7a26dccde (patch) | |
| tree | 94fa59472e6b2a0ef3c3cc97ffe115103e66977d | |
| parent | 79fa64792bbab42e97785552b9a9cf75fa126695 (diff) | |
| parent | b9eb35ddebc45ca5424bb3c24d03c3585ba6030f (diff) | |
| download | tk-d965535fda1022e02c618349271e8ec7a26dccde.zip tk-d965535fda1022e02c618349271e8ec7a26dccde.tar.gz tk-d965535fda1022e02c618349271e8ec7a26dccde.tar.bz2 | |
eliminate some ANSI_ARGS
| -rw-r--r-- | generic/tkMain.c | 2 | ||||
| -rw-r--r-- | generic/tkStubInit.c | 16 | ||||
| -rw-r--r-- | unix/tkAppInit.c | 6 | ||||
| -rw-r--r-- | unix/tkUnixXId.c | 2 |
4 files changed, 13 insertions, 13 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__ */ diff --git a/unix/tkAppInit.c b/unix/tkAppInit.c index 050e226..422b9e1 100644 --- a/unix/tkAppInit.c +++ b/unix/tkAppInit.c @@ -15,7 +15,7 @@ #include "locale.h" #ifdef TK_TEST -extern int Tktest_Init _ANSI_ARGS_((Tcl_Interp *interp)); +extern int Tktest_Init(Tcl_Interp *interp); #endif /* TK_TEST */ /* @@ -50,7 +50,7 @@ main( #ifndef TK_LOCAL_APPINIT #define TK_LOCAL_APPINIT Tcl_AppInit #endif - extern int TK_LOCAL_APPINIT _ANSI_ARGS_((Tcl_Interp *interp)); + extern int TK_LOCAL_APPINIT (Tcl_Interp *interp); /* * The following #if block allows you to change how Tcl finds the startup @@ -59,7 +59,7 @@ main( */ #ifdef TK_LOCAL_MAIN_HOOK - extern int TK_LOCAL_MAIN_HOOK _ANSI_ARGS_((int *argc, char ***argv)); + extern int TK_LOCAL_MAIN_HOOK (int *argc, char ***argv); TK_LOCAL_MAIN_HOOK(&argc, &argv); #endif diff --git a/unix/tkUnixXId.c b/unix/tkUnixXId.c index 928c4d5..ca2eb33 100644 --- a/unix/tkUnixXId.c +++ b/unix/tkUnixXId.c @@ -74,7 +74,7 @@ TkInitXId( TkDisplay *dispPtr) /* Tk's information about the display. */ { dispPtr->idStackPtr = NULL; - dispPtr->defaultAllocProc = (XID (*) _ANSI_ARGS_((Display *display))) + dispPtr->defaultAllocProc = (XID (*) (Display *display)) dispPtr->display->resource_alloc; dispPtr->display->resource_alloc = AllocXId; dispPtr->windowStackPtr = NULL; |