summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2001-03-30 22:42:10 (GMT)
committerhobbs <hobbs>2001-03-30 22:42:10 (GMT)
commit0dcaafd32b3ba64d04c60046ecbc7d774e60de66 (patch)
tree4e5cca0582f4aac9668e0101565cb169fe9f4543
parent267dca578ae24162fd19b04a128c43c31a9823ae (diff)
downloadtk-0dcaafd32b3ba64d04c60046ecbc7d774e60de66.zip
tk-0dcaafd32b3ba64d04c60046ecbc7d774e60de66.tar.gz
tk-0dcaafd32b3ba64d04c60046ecbc7d774e60de66.tar.bz2
* generic/tkImage.c (Tk_ImageObjCmd, EventuallyDeleteImage):
added casts to allow compiling on Windows with debbuging.
-rw-r--r--generic/tkImage.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/generic/tkImage.c b/generic/tkImage.c
index f8d5388..c556b2b 100644
--- a/generic/tkImage.c
+++ b/generic/tkImage.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: tkImage.c,v 1.10 2000/11/29 15:47:05 dkf Exp $
+ * RCS: @(#) $Id: tkImage.c,v 1.11 2001/03/30 22:42:10 hobbs Exp $
*/
#include "tkInt.h"
@@ -293,18 +293,18 @@ Tk_ImageObjCmd(clientData, interp, objc, objv)
}
args[objc] = NULL;
}
- Tcl_Preserve(masterPtr);
+ Tcl_Preserve((ClientData) masterPtr);
if ((*typePtr->createProc)(interp, name, objc,
args, typePtr, (Tk_ImageMaster) masterPtr,
&masterPtr->masterData) != TCL_OK) {
EventuallyDeleteImage(masterPtr);
- Tcl_Release(masterPtr);
+ Tcl_Release((ClientData) masterPtr);
if (oldimage) {
ckfree((char *) args);
}
return TCL_ERROR;
}
- Tcl_Release(masterPtr);
+ Tcl_Release((ClientData) masterPtr);
if (oldimage) {
ckfree((char *) args);
}
@@ -937,7 +937,8 @@ EventuallyDeleteImage(masterPtr)
{
if (!masterPtr->deleted) {
masterPtr->deleted = 1;
- Tcl_EventuallyFree(masterPtr, (Tcl_FreeProc *)DeleteImage);
+ Tcl_EventuallyFree((ClientData) masterPtr,
+ (Tcl_FreeProc *)DeleteImage);
}
}