diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | generic/tclIO.c | 2 | ||||
| -rw-r--r-- | generic/tclIOCmd.c | 2 | ||||
| -rw-r--r-- | generic/tclStubInit.c | 32 | ||||
| -rw-r--r-- | generic/tclTest.c | 2 | ||||
| -rw-r--r-- | unix/tclUnixChan.c | 2 |
6 files changed, 28 insertions, 20 deletions
@@ -1,3 +1,11 @@ +2012-04-26 Jan Nijtmans <nijtmans@users.sf.net> + + * generic/tclStubInit.c: get rid of _ANSI_ARGS_ and CONST + * generic/tclIO.c + * generic/tclIOCmd.c + * generic/tclTest.c + * unix/tclUnixChan.c + 2012-04-25 Donal K. Fellows <dkf@users.sf.net> * generic/tclUtil.c (TclDStringToObj): Added internal function to make diff --git a/generic/tclIO.c b/generic/tclIO.c index 96e6de3..4ba8cd1 100644 --- a/generic/tclIO.c +++ b/generic/tclIO.c @@ -8856,7 +8856,7 @@ Tcl_FileEventObjCmd( int modeIndex; /* Index of mode argument. */ int mask; static const char *const modeOptions[] = {"readable", "writable", NULL}; - static CONST int maskArray[] = {TCL_READABLE, TCL_WRITABLE}; + static const int maskArray[] = {TCL_READABLE, TCL_WRITABLE}; if ((objc != 3) && (objc != 4)) { Tcl_WrongNumArgs(interp, 1, objv, "channelId event ?script?"); diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c index b22d746..59856d0 100644 --- a/generic/tclIOCmd.c +++ b/generic/tclIOCmd.c @@ -521,7 +521,7 @@ Tcl_SeekObjCmd( static const char *const originOptions[] = { "start", "current", "end", NULL }; - static CONST int modeArray[] = {SEEK_SET, SEEK_CUR, SEEK_END}; + static const int modeArray[] = {SEEK_SET, SEEK_CUR, SEEK_END}; if ((objc != 3) && (objc != 4)) { Tcl_WrongNumArgs(interp, 1, objv, "channelId offset ?origin?"); diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index 04f9217..3483074 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -171,28 +171,28 @@ Tcl_WinTCharToUtf( string, len, dsPtr); } -#define Tcl_MacOSXOpenBundleResources (int (*) _ANSI_ARGS_(( \ - Tcl_Interp *, const char *, int, int, char *))) Tcl_WinUtfToTChar -#define Tcl_MacOSXOpenVersionedBundleResources (int (*) _ANSI_ARGS_(( \ - Tcl_Interp *, const char *, const char *, int, int, char *))) Tcl_WinTCharToUtf -#define TclMacOSXGetFileAttribute (int (*) _ANSI_ARGS_((Tcl_Interp *, \ - int, Tcl_Obj *, Tcl_Obj **))) TclpCreateProcess -#define TclMacOSXMatchType (int (*) _ANSI_ARGS_((Tcl_Interp *, const char *, \ - const char *, Tcl_StatBuf *, Tcl_GlobTypeData *))) TclpMakeFile -#define TclMacOSXNotifierAddRunLoopMode (void (*) _ANSI_ARGS_((const void *))) TclpOpenFile -#define TclpLocaltime_unix (struct tm *(*) _ANSI_ARGS_((const time_t *))) TclGetAndDetachPids -#define TclpGmtime_unix (struct tm *(*) _ANSI_ARGS_((const time_t *))) TclpCloseFile +#define Tcl_MacOSXOpenBundleResources (int (*) ( \ + Tcl_Interp *, const char *, int, int, char *)) Tcl_WinUtfToTChar +#define Tcl_MacOSXOpenVersionedBundleResources (int (*) ( \ + Tcl_Interp *, const char *, const char *, int, int, char *)) Tcl_WinTCharToUtf +#define TclMacOSXGetFileAttribute (int (*) (Tcl_Interp *, \ + int, Tcl_Obj *, Tcl_Obj **)) TclpCreateProcess +#define TclMacOSXMatchType (int (*) (Tcl_Interp *, const char *, \ + const char *, Tcl_StatBuf *, Tcl_GlobTypeData *)) TclpMakeFile +#define TclMacOSXNotifierAddRunLoopMode (void (*) (const void *)) TclpOpenFile +#define TclpLocaltime_unix (struct tm *(*) (const time_t *)) TclGetAndDetachPids +#define TclpGmtime_unix (struct tm *(*) (const time_t *)) TclpCloseFile #elif !defined(__WIN32__) /* UNIX and MAC */ -# define TclWinConvertError (void (*) _ANSI_ARGS_((unsigned int))) TclGetAndDetachPids +# define TclWinConvertError (void (*) (unsigned int)) TclGetAndDetachPids # undef TclWinConvertWSAError -# define TclWinConvertWSAError (void (*) _ANSI_ARGS_((unsigned int))) TclpCloseFile +# define TclWinConvertWSAError (void (*) (unsigned int)) TclpCloseFile # define TclWinGetPlatformId (int (*)()) TclpCreateTempFile # define TclWinGetTclInstance (void *(*)()) TclpCreateProcess # define TclWinNToHS (unsigned short (*) _ANSI_ARGS_((unsigned short ns))) TclpMakeFile -# define TclWinSetSockOpt (int (*) _ANSI_ARGS_((void *, int, int, const char *, int))) TclpOpenFile -# define TclWinGetSockOpt (int (*) _ANSI_ARGS_((void *, int, int, char *, int *))) TclpCreatePipe -# define TclWinGetServByName (struct servent *(*) _ANSI_ARGS_((const char *nm, const char *proto))) TclpCreateCommandChannel +# define TclWinSetSockOpt (int (*) (void *, int, int, const char *, int)) TclpOpenFile +# define TclWinGetSockOpt (int (*) (void *, int, int, char *, int *)) TclpCreatePipe +# define TclWinGetServByName (struct servent *(*) (const char *nm, const char *proto)) TclpCreateCommandChannel # define TclIntPlatReserved13 (void (*) ()) TclpInetNtoa # define TclWinAddProcess 0 # define TclWinNoBackslash 0 diff --git a/generic/tclTest.c b/generic/tclTest.c index 004fadc..7631dee 100644 --- a/generic/tclTest.c +++ b/generic/tclTest.c @@ -3262,7 +3262,7 @@ TestlocaleCmd( "ctype", "numeric", "time", "collate", "monetary", "all", NULL }; - static CONST int lcTypes[] = { + static const int lcTypes[] = { LC_CTYPE, LC_NUMERIC, LC_TIME, LC_COLLATE, LC_MONETARY, LC_ALL }; diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c index db137aa..b05a9f2 100644 --- a/unix/tclUnixChan.c +++ b/unix/tclUnixChan.c @@ -981,7 +981,7 @@ TtyGetOptionProc( # define TtyGetBaud(speed) ((int) (speed)) #else /* !DIRECT_BAUD */ -static CONST struct {int baud; unsigned long speed;} speeds[] = { +static const struct {int baud; unsigned long speed;} speeds[] = { #ifdef B0 {0, B0}, #endif |