diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2007-01-12 09:08:36 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2007-01-12 09:08:36 (GMT) |
| commit | 013750d43b06442c312060f6460e31c546f95674 (patch) | |
| tree | bf715acf4f3bdec103ff3e909993230f127ce6d9 | |
| parent | c48f4f5bf3717299252cba2e4faa31f395ce1689 (diff) | |
| download | tk-013750d43b06442c312060f6460e31c546f95674.zip tk-013750d43b06442c312060f6460e31c546f95674.tar.gz tk-013750d43b06442c312060f6460e31c546f95674.tar.bz2 | |
Quell type-punning warnings from gcc/unix build
| -rw-r--r-- | generic/tkImgGIF.c | 10 | ||||
| -rw-r--r-- | unix/tkUnixEvent.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/generic/tkImgGIF.c b/generic/tkImgGIF.c index 970c253..c2bc318 100644 --- a/generic/tkImgGIF.c +++ b/generic/tkImgGIF.c @@ -32,7 +32,7 @@ * This file also contains code from miGIF. See lower down in file for the * applicable copyright notice for that portion. * - * RCS: @(#) $Id: tkImgGIF.c,v 1.34 2007/01/11 15:35:39 dkf Exp $ + * RCS: @(#) $Id: tkImgGIF.c,v 1.35 2007/01/12 09:08:36 dkf Exp $ */ /* @@ -627,11 +627,11 @@ StringReadGIF( int width, int height, /* image to copy */ int srcX, int srcY) { - MFile handle; + MFile handle, *hdlPtr = &handle; int length; char *data = (char *) Tcl_GetByteArrayFromObj(dataObj, &length); - mInit((unsigned char *)data, &handle, length); + mInit((unsigned char *)data, hdlPtr, length); if (strncmp(GIF87a, data, 6) && strncmp(GIF89a, data, 6)) { /* @@ -641,10 +641,10 @@ StringReadGIF( * because of potential padding). */ - return FileReadGIF(interp, (Tcl_Channel) &handle, INLINE_DATA_BASE64, + return FileReadGIF(interp, (Tcl_Channel) hdlPtr, INLINE_DATA_BASE64, format, imageHandle, destX, destY, width, height, srcX, srcY); } else { - return FileReadGIF(interp, (Tcl_Channel) &handle, INLINE_DATA_BINARY, + return FileReadGIF(interp, (Tcl_Channel) hdlPtr, INLINE_DATA_BINARY, format, imageHandle, destX, destY, width, height, srcX, srcY); } } diff --git a/unix/tkUnixEvent.c b/unix/tkUnixEvent.c index 8fb410a..46caeb3 100644 --- a/unix/tkUnixEvent.c +++ b/unix/tkUnixEvent.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: tkUnixEvent.c,v 1.22 2007/01/11 18:53:16 hobbs Exp $ + * RCS: @(#) $Id: tkUnixEvent.c,v 1.23 2007/01/12 09:08:36 dkf Exp $ */ #include "tkInt.h" @@ -537,7 +537,7 @@ TkUnixDoOneXEvent( } } - numFound = select(numFdBits, (SELECT_MASK *) &readMask[0], NULL, NULL, + numFound = select(numFdBits, (SELECT_MASK *) readMask, NULL, NULL, timeoutPtr); if (numFound <= 0) { /* |