diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2012-04-19 12:20:49 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2012-04-19 12:20:49 (GMT) |
| commit | aa9a7997f65ea79e1228e2b42857e54856245275 (patch) | |
| tree | acb4fa1b8de8d2a0c978cd9f8c3995391c0820d5 /generic | |
| parent | 88574b7bc539d00b6477f8d9bbe7f25158b57662 (diff) | |
| parent | bcd88b005a09280f4b9725d611fd3763fd07241f (diff) | |
| download | tcl-aa9a7997f65ea79e1228e2b42857e54856245275.zip tcl-aa9a7997f65ea79e1228e2b42857e54856245275.tar.gz tcl-aa9a7997f65ea79e1228e2b42857e54856245275.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclCompExpr.c | 2 | ||||
| -rw-r--r-- | generic/tclStubInit.c | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/generic/tclCompExpr.c b/generic/tclCompExpr.c index b043fed..4212b6d 100644 --- a/generic/tclCompExpr.c +++ b/generic/tclCompExpr.c @@ -436,7 +436,7 @@ static const unsigned char instruction[] = { * ParseLexeme(). */ -static unsigned char Lexeme[] = { +static const unsigned char Lexeme[] = { INVALID /* NUL */, INVALID /* SOH */, INVALID /* STX */, INVALID /* ETX */, INVALID /* EOT */, INVALID /* ENQ */, diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index 4d4f509..8f42f96 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -125,7 +125,7 @@ doNothing(void) static char * Tcl_WinUtfToTChar(string, len, dsPtr) - CONST char *string; + const char *string; int len; Tcl_DString *dsPtr; { @@ -138,7 +138,7 @@ Tcl_WinUtfToTChar(string, len, dsPtr) static char * Tcl_WinTCharToUtf( - CONST char *string, + const char *string, int len, Tcl_DString *dsPtr) { @@ -150,16 +150,16 @@ Tcl_WinTCharToUtf( } #define Tcl_MacOSXOpenBundleResources (int (*) _ANSI_ARGS_(( \ - Tcl_Interp *, CONST char *, int, int, char *))) Tcl_WinUtfToTChar + 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 + 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 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 #elif !defined(__WIN32__) /* UNIX and MAC */ # define TclWinConvertError (void (*) _ANSI_ARGS_((unsigned int))) TclGetAndDetachPids |