summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--generic/tclEvent.c5
-rw-r--r--generic/tclIOUtil.c10
-rw-r--r--generic/tclListObj.c14
4 files changed, 21 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ee2ed9..84af0ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2002-01-07 Don Porter <dgp@users.sourceforge.net>
+ * generic/tclEvent.c (TclInExit):
+ * generic/tclIOUtil.c (SetFsPathFromAbsoluteNormalized,
+ SetFsPathFromAny,Tcl_FSNewNativePath,DupFsPathInternalRep):
+ * generic/tclListObj.c (TclLsetList,TclLsetFlat): Added some type
+ casts to satisfy picky compilers.
+
* generic/tclMain.c: Bug fix: neglected the NULL case in
TclGetStartupScriptFileName(). Broke Tk/wish.
diff --git a/generic/tclEvent.c b/generic/tclEvent.c
index 52d461f..da526c4 100644
--- a/generic/tclEvent.c
+++ b/generic/tclEvent.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: tclEvent.c,v 1.16 2001/12/10 20:30:13 msofer Exp $
+ * RCS: @(#) $Id: tclEvent.c,v 1.17 2002/01/07 23:09:13 dgp Exp $
*/
#include "tclInt.h"
@@ -938,7 +938,8 @@ Tcl_FinalizeThread()
int
TclInExit()
{
- ThreadSpecificData *tsdPtr = TclThreadDataKeyGet(&dataKey);
+ ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
+ TclThreadDataKeyGet(&dataKey);
if (tsdPtr == NULL) {
return inFinalize;
} else {
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index ac02ecb..7655f2e 100644
--- a/generic/tclIOUtil.c
+++ b/generic/tclIOUtil.c
@@ -17,7 +17,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclIOUtil.c,v 1.27 2002/01/03 21:52:15 dgp Exp $
+ * RCS: @(#) $Id: tclIOUtil.c,v 1.28 2002/01/07 23:09:13 dgp Exp $
*/
#include "tclInt.h"
@@ -3405,7 +3405,7 @@ SetFsPathFromAbsoluteNormalized(interp, objPtr)
fsPathPtr->fsRecPtr = NULL;
fsPathPtr->filesystemEpoch = -1;
- objPtr->internalRep.otherValuePtr = fsPathPtr;
+ objPtr->internalRep.otherValuePtr = (VOID *) fsPathPtr;
objPtr->typePtr = &tclFsPathType;
return TCL_OK;
@@ -3564,7 +3564,7 @@ SetFsPathFromAny(interp, objPtr)
fsPathPtr->fsRecPtr = NULL;
fsPathPtr->filesystemEpoch = -1;
- objPtr->internalRep.otherValuePtr = fsPathPtr;
+ objPtr->internalRep.otherValuePtr = (VOID *) fsPathPtr;
objPtr->typePtr = &tclFsPathType;
return TCL_OK;
@@ -3642,7 +3642,7 @@ Tcl_FSNewNativePath(fromFilesystem, clientData)
fsPathPtr->fsRecPtr = fsFromPtr->fsRecPtr;
fsPathPtr->filesystemEpoch = fsFromPtr->filesystemEpoch;
- objPtr->internalRep.otherValuePtr = fsPathPtr;
+ objPtr->internalRep.otherValuePtr = (VOID *) fsPathPtr;
objPtr->typePtr = &tclFsPathType;
return objPtr;
}
@@ -3697,7 +3697,7 @@ DupFsPathInternalRep(srcPtr, copyPtr)
(FsPath*) ckalloc((unsigned)sizeof(FsPath));
Tcl_FSDupInternalRepProc *dupProc;
- copyPtr->internalRep.otherValuePtr = copyFsPathPtr;
+ copyPtr->internalRep.otherValuePtr = (VOID *) copyFsPathPtr;
if (srcFsPathPtr->translatedPathPtr != NULL) {
copyFsPathPtr->translatedPathPtr = srcFsPathPtr->translatedPathPtr;
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index 864ab35..cdd8cb9 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.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: tclListObj.c,v 1.12 2001/12/28 23:36:31 dgp Exp $
+ * RCS: @(#) $Id: tclListObj.c,v 1.13 2002/01/07 23:09:13 dgp Exp $
*/
#include "tclInt.h"
@@ -927,7 +927,7 @@ TclLsetList( interp, listPtr, indexArgPtr, valuePtr )
if ( result != TCL_OK ) {
break;
}
- listPtr->internalRep.twoPtrValue.ptr2 = chainPtr;
+ listPtr->internalRep.twoPtrValue.ptr2 = (VOID *) chainPtr;
/*
* Reconstitute the index array
@@ -1014,12 +1014,12 @@ TclLsetList( interp, listPtr, indexArgPtr, valuePtr )
if ( result == TCL_OK ) {
- listPtr->internalRep.twoPtrValue.ptr2 = chainPtr;
+ listPtr->internalRep.twoPtrValue.ptr2 = (VOID *) chainPtr;
/* Spoil all the string reps */
while ( listPtr != NULL ) {
- subListPtr = listPtr->internalRep.twoPtrValue.ptr2;
+ subListPtr = (Tcl_Obj *) listPtr->internalRep.twoPtrValue.ptr2;
Tcl_InvalidateStringRep( listPtr );
listPtr->internalRep.twoPtrValue.ptr2 = NULL;
listPtr = subListPtr;
@@ -1164,7 +1164,7 @@ TclLsetFlat( interp, listPtr, indexCount, indexArray, valuePtr )
if ( result != TCL_OK ) {
break;
}
- listPtr->internalRep.twoPtrValue.ptr2 = chainPtr;
+ listPtr->internalRep.twoPtrValue.ptr2 = (VOID *) chainPtr;
/*
* Determine the index of the requested element.
@@ -1235,12 +1235,12 @@ TclLsetFlat( interp, listPtr, indexCount, indexArray, valuePtr )
if ( result == TCL_OK ) {
- listPtr->internalRep.twoPtrValue.ptr2 = chainPtr;
+ listPtr->internalRep.twoPtrValue.ptr2 = (VOID *) chainPtr;
/* Spoil all the string reps */
while ( listPtr != NULL ) {
- subListPtr = listPtr->internalRep.twoPtrValue.ptr2;
+ subListPtr = (Tcl_Obj *) listPtr->internalRep.twoPtrValue.ptr2;
Tcl_InvalidateStringRep( listPtr );
listPtr->internalRep.twoPtrValue.ptr2 = NULL;
listPtr = subListPtr;