From cd728b4198f9384debed58dc7650a4e46b657237 Mon Sep 17 00:00:00 2001 From: das Date: Fri, 18 Jan 2002 03:22:31 +0000 Subject: * generic/tclThreadTest.c: * mac/tclMacChan.c: * mac/tclMacFCmd.c: * mac/tclMacFile.c: * mac/tclMacLoad.c: * mac/tclMacResource.c: TIP 27 CONSTification broke the mac build in a number of places. --- ChangeLog | 10 ++++++++++ generic/tclThreadTest.c | 4 ++-- mac/tclMacChan.c | 6 +++--- mac/tclMacFCmd.c | 10 +++++----- mac/tclMacFile.c | 4 ++-- mac/tclMacLoad.c | 4 ++-- mac/tclMacResource.c | 8 ++++---- 7 files changed, 28 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4d33b26..64294ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -118,6 +118,16 @@ * generic/tclDecls.h: make genstubs +2001-01-18 Daniel Steffen + + * generic/tclThreadTest.c: + * mac/tclMacChan.c: + * mac/tclMacFCmd.c: + * mac/tclMacFile.c: + * mac/tclMacLoad.c: + * mac/tclMacResource.c: TIP 27 CONSTification broke the mac + build in a number of places. + 2002-01-15 Don Porter * doc/SetErrno.3 (Tcl_ErrnoMsg): Corrected documentation for diff --git a/generic/tclThreadTest.c b/generic/tclThreadTest.c index acbb796..651c820 100644 --- a/generic/tclThreadTest.c +++ b/generic/tclThreadTest.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclThreadTest.c,v 1.13 2001/12/29 00:49:49 hobbs Exp $ + * RCS: @(#) $Id: tclThreadTest.c,v 1.14 2002/01/18 03:22:31 das Exp $ */ #include "tclInt.h" @@ -203,7 +203,7 @@ Tcl_ThreadObjCmd(dummy, interp, objc, objv) { ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey); int option; - static char *threadOptions[] = {"create", "exit", "id", "join", "names", + static CONST char *threadOptions[] = {"create", "exit", "id", "join", "names", "send", "wait", "errorproc", (char *) NULL}; enum options {THREAD_CREATE, THREAD_EXIT, THREAD_ID, THREAD_JOIN, diff --git a/mac/tclMacChan.c b/mac/tclMacChan.c index 0b36485..da74176 100644 --- a/mac/tclMacChan.c +++ b/mac/tclMacChan.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclMacChan.c,v 1.10 2002/01/15 21:19:07 dgp Exp $ + * RCS: @(#) $Id: tclMacChan.c,v 1.11 2002/01/18 03:22:36 das Exp $ */ #include "tclInt.h" @@ -558,7 +558,7 @@ StdIOOutput( *errorCode = 0; errno = 0; fd = (int) ((FileState*)instanceData)->fileRef; - written = write(fd, buf, (size_t) toWrite); + written = write(fd, (void*)buf, (size_t) toWrite); if (written > -1) { return written; } @@ -762,7 +762,7 @@ TclpOpenFileChannel( { Tcl_Channel chan; int mode; - char *native; + CONST char *native; int errorCode; mode = GetOpenMode(interp, modeString); diff --git a/mac/tclMacFCmd.c b/mac/tclMacFCmd.c index 723eb5d..27196f5 100644 --- a/mac/tclMacFCmd.c +++ b/mac/tclMacFCmd.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclMacFCmd.c,v 1.12 2002/01/17 04:37:33 dgp Exp $ + * RCS: @(#) $Id: tclMacFCmd.c,v 1.13 2002/01/18 03:22:40 das Exp $ */ #include "tclInt.h" @@ -1163,7 +1163,7 @@ GetFileFinderAttributes( OSErr err; FSSpec fileSpec; FInfo finfo; - char *native; + CONST char *native; native=Tcl_FSGetNativePath(fileName); err = FSpLocationFromPath(strlen(native), @@ -1241,7 +1241,7 @@ GetFileReadOnly( OSErr err; FSSpec fileSpec; CInfoPBRec paramBlock; - char *native; + CONST char *native; native=Tcl_FSGetNativePath(fileName); err = FSpLocationFromPath(strlen(native), @@ -1305,7 +1305,7 @@ SetFileFinderAttributes( OSErr err; FSSpec fileSpec; FInfo finfo; - char *native; + CONST char *native; native=Tcl_FSGetNativePath(fileName); err = FSpLocationFromPath(strlen(native), @@ -1397,7 +1397,7 @@ SetFileReadOnly( FSSpec fileSpec; HParamBlockRec paramBlock; int hidden; - char *native; + CONST char *native; native=Tcl_FSGetNativePath(fileName); err = FSpLocationFromPath(strlen(native), diff --git a/mac/tclMacFile.c b/mac/tclMacFile.c index 0084da5..d38d784 100644 --- a/mac/tclMacFile.c +++ b/mac/tclMacFile.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclMacFile.c,v 1.13 2001/11/23 01:27:32 das Exp $ + * RCS: @(#) $Id: tclMacFile.c,v 1.14 2002/01/18 03:22:52 das Exp $ */ /* @@ -39,7 +39,7 @@ FspLocationFromFsPath(pathPtr, specPtr) Tcl_Obj *pathPtr; FSSpec* specPtr; { - char *native = Tcl_FSGetNativePath(pathPtr); + CONST char *native = Tcl_FSGetNativePath(pathPtr); return FSpLocationFromPath(strlen(native), native, specPtr); } diff --git a/mac/tclMacLoad.c b/mac/tclMacLoad.c index 9dd32be..1082a23 100644 --- a/mac/tclMacLoad.c +++ b/mac/tclMacLoad.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclMacLoad.c,v 1.10 2002/01/17 03:03:12 dgp Exp $ + * RCS: @(#) $Id: tclMacLoad.c,v 1.11 2002/01/18 03:22:58 das Exp $ */ #include @@ -130,7 +130,7 @@ TclpLoadFile( Tcl_DString ds; char *native; - native = Tcl_FSGetNativePath(pathPtr); + native = (char *) Tcl_FSGetNativePath(pathPtr); err = FSpLocationFromPath(strlen(native), native, &fileSpec); if (err != noErr) { diff --git a/mac/tclMacResource.c b/mac/tclMacResource.c index 4c06237..4f72b9e 100644 --- a/mac/tclMacResource.c +++ b/mac/tclMacResource.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclMacResource.c,v 1.8 2001/07/31 19:12:07 vincentdarley Exp $ + * RCS: @(#) $Id: tclMacResource.c,v 1.9 2002/01/18 03:23:02 das Exp $ */ #include @@ -149,7 +149,7 @@ Tcl_ResourceObjCmd( char macPermision; int mode; - static char *switches[] = {"close", "delete" ,"files", "list", + static CONST char *switches[] = {"close", "delete" ,"files", "list", "open", "read", "types", "write", (char *) NULL }; @@ -158,7 +158,7 @@ Tcl_ResourceObjCmd( RESOURCE_OPEN, RESOURCE_READ, RESOURCE_TYPES, RESOURCE_WRITE }; - static char *writeSwitches[] = { + static CONST char *writeSwitches[] = { "-id", "-name", "-file", "-force", (char *) NULL }; @@ -167,7 +167,7 @@ Tcl_ResourceObjCmd( RESOURCE_WRITE_FILE, RESOURCE_FORCE }; - static char *deleteSwitches[] = {"-id", "-name", "-file", (char *) NULL}; + static CONST char *deleteSwitches[] = {"-id", "-name", "-file", (char *) NULL}; enum {RESOURCE_DELETE_ID, RESOURCE_DELETE_NAME, RESOURCE_DELETE_FILE}; -- cgit v0.12