From 442ab865448157a4c941c38bc1647f91eef934a0 Mon Sep 17 00:00:00 2001 From: nijtmans Date: Wed, 22 Jul 2009 12:00:42 +0000 Subject: * macosx/tclMacOSXFCmd.c: CONST -> const * generic/tclGetDate.y: * generic/tclDate.c: * generic/tclLiteral.c: (char *) cast in ckfree call FossilOrigin-Name: 86068bf4d3c158e744c84ceea87c4f51dbdee7bc --- ChangeLog | 7 +++++++ generic/tclDate.c | 2 +- generic/tclGetDate.y | 4 ++-- generic/tclLiteral.c | 8 ++++---- macosx/tclMacOSXNotify.c | 6 +++--- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index f95c3ce..9420174 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-07-22 Jan Nijtmans + + * macosx/tclMacOSXFCmd.c: CONST -> const + * generic/tclGetDate.y: + * generic/tclDate.c: + * generic/tclLiteral.c: (char *) cast in ckfree call + 2009-07-22 Alexandre Ferrieux * generic/tclEvent.c: Refined the 20090617 patch on [exit] diff --git a/generic/tclDate.c b/generic/tclDate.c index 432225d..7f67156 100644 --- a/generic/tclDate.c +++ b/generic/tclDate.c @@ -2757,7 +2757,7 @@ TclClockOldscanObjCmd( ClientData clientData, /* Unused */ Tcl_Interp *interp, /* Tcl interpreter */ int objc, /* Count of paraneters */ - Tcl_Obj *CONST *objv) /* Parameters */ + Tcl_Obj *const *objv) /* Parameters */ { Tcl_Obj *result, *resultElement; int yr, mo, da; diff --git a/generic/tclGetDate.y b/generic/tclGetDate.y index 844632e..8014b73 100644 --- a/generic/tclGetDate.y +++ b/generic/tclGetDate.y @@ -13,7 +13,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclGetDate.y,v 1.41 2009/06/09 13:52:37 kennykb Exp $ + * RCS: @(#) $Id: tclGetDate.y,v 1.42 2009/07/22 12:00:42 nijtmans Exp $ */ %parse-param {DateInfo* info} @@ -969,7 +969,7 @@ TclClockOldscanObjCmd( ClientData clientData, /* Unused */ Tcl_Interp *interp, /* Tcl interpreter */ int objc, /* Count of paraneters */ - Tcl_Obj *CONST *objv) /* Parameters */ + Tcl_Obj *const *objv) /* Parameters */ { Tcl_Obj *result, *resultElement; int yr, mo, da; diff --git a/generic/tclLiteral.c b/generic/tclLiteral.c index ccee1c4..5d4974a 100644 --- a/generic/tclLiteral.c +++ b/generic/tclLiteral.c @@ -13,7 +13,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclLiteral.c,v 1.35 2009/02/10 22:49:50 nijtmans Exp $ + * RCS: @(#) $Id: tclLiteral.c,v 1.36 2009/07/22 12:00:42 nijtmans Exp $ */ #include "tclInt.h" @@ -282,7 +282,7 @@ TclCreateLiteral( *globalPtrPtr = globalPtr; } if (flags & LITERAL_ON_HEAP) { - ckfree(bytes); + ckfree((char *) bytes); } globalPtr->refCount++; return objPtr; @@ -290,7 +290,7 @@ TclCreateLiteral( } if (!newPtr) { if (flags & LITERAL_ON_HEAP) { - ckfree(bytes); + ckfree((char *) bytes); } return NULL; } @@ -438,7 +438,7 @@ TclRegisterLiteral( || ((objPtr->bytes[0] == bytes[0]) && (memcmp(objPtr->bytes, bytes, (unsigned) length) == 0)))) { if (flags & LITERAL_ON_HEAP) { - ckfree(bytes); + ckfree((char *) bytes); } objIndex = (localPtr - envPtr->literalArrayPtr); #ifdef TCL_COMPILE_DEBUG diff --git a/macosx/tclMacOSXNotify.c b/macosx/tclMacOSXNotify.c index a1bc7c1..ee4335a 100644 --- a/macosx/tclMacOSXNotify.c +++ b/macosx/tclMacOSXNotify.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclMacOSXNotify.c,v 1.26 2009/04/14 00:55:31 das Exp $ + * RCS: @(#) $Id: tclMacOSXNotify.c,v 1.27 2009/07/22 12:00:42 nijtmans Exp $ */ #include "tclInt.h" @@ -1655,7 +1655,7 @@ TclUnixWaitForFile( if (FD_ISSET(fd, &writableMask)) { SET_BITS(result, TCL_WRITABLE); } - if (FD_ISSET(fd, &exceptionalMask)) { + if (FD_ISSET(fd, &exceptionalMask)) { SET_BITS(result, TCL_EXCEPTION); } result &= mask; @@ -1973,7 +1973,7 @@ AtForkChild(void) void TclMacOSXNotifierAddRunLoopMode( - CONST void *runLoopMode) + const void *runLoopMode) { Tcl_Panic("TclMacOSXNotifierAddRunLoopMode: " "Tcl not built with CoreFoundation support"); -- cgit v0.12