diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-26 19:59:31 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-26 19:59:31 (GMT) |
| commit | dbae0710833f1ecef64a517c3f20bd1ce3b7ed86 (patch) | |
| tree | d37928715d24da5d6d679e5e0256ab693f4a40a0 /generic | |
| parent | a96ba8ec6197c35dbd3839eebbcfe001543bdad9 (diff) | |
| parent | efeae981600cc17e5c9b076cf767c7e9a1efcfd8 (diff) | |
| download | tcl-dbae0710833f1ecef64a517c3f20bd1ce3b7ed86.zip tcl-dbae0710833f1ecef64a517c3f20bd1ce3b7ed86.tar.gz tcl-dbae0710833f1ecef64a517c3f20bd1ce3b7ed86.tar.bz2 | |
get rid of _ANSI_ARGS_ and CONST
Diffstat (limited to 'generic')
| -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 |
4 files changed, 19 insertions, 19 deletions
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 }; |