diff options
| -rw-r--r-- | generic/tkImgGIF.c | 6 | ||||
| -rw-r--r-- | macosx/tkMacOSXCursor.c | 4 | ||||
| -rw-r--r-- | macosx/tkMacOSXDebug.c | 4 | ||||
| -rw-r--r-- | macosx/tkMacOSXInit.c | 4 | ||||
| -rw-r--r-- | xlib/xgc.c | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/generic/tkImgGIF.c b/generic/tkImgGIF.c index 70f77b0..b0dbcef 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.32 2006/03/27 10:55:49 dkf Exp $ + * RCS: @(#) $Id: tkImgGIF.c,v 1.33 2006/07/20 06:24:16 das Exp $ */ /* @@ -831,8 +831,8 @@ ReadImage( unsigned char initialCodeSize; int xpos = 0, ypos = 0, pass = 0, i; register char *pixelPtr; - CONST static int interlaceStep[] = { 8, 8, 4, 2 }; - CONST static int interlaceStart[] = { 0, 4, 2, 1 }; + static CONST int interlaceStep[] = { 8, 8, 4, 2 }; + static CONST int interlaceStart[] = { 0, 4, 2, 1 }; unsigned short prefix[(1 << MAX_LWZ_BITS)]; unsigned char append[(1 << MAX_LWZ_BITS)]; unsigned char stack[(1 << MAX_LWZ_BITS)*2]; diff --git a/macosx/tkMacOSXCursor.c b/macosx/tkMacOSXCursor.c index b7d4eba..5b3cfa4 100644 --- a/macosx/tkMacOSXCursor.c +++ b/macosx/tkMacOSXCursor.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: tkMacOSXCursor.c,v 1.7 2006/03/24 14:58:01 das Exp $ + * RCS: @(#) $Id: tkMacOSXCursor.c,v 1.8 2006/07/20 06:24:16 das Exp $ */ #include "tkMacOSXInt.h" @@ -37,7 +37,7 @@ typedef struct { int type; /* Type of Mac cursor: for theme cursors * this is the theme cursor constant, * otherwise one of crsr or CURS */ - unsigned int count; /* For animating cursors, the count for the + int count; /* For animating cursors, the count for the cursor. */ } TkMacOSXCursor; diff --git a/macosx/tkMacOSXDebug.c b/macosx/tkMacOSXDebug.c index 1bb23b5..1d11c9a 100644 --- a/macosx/tkMacOSXDebug.c +++ b/macosx/tkMacOSXDebug.c @@ -54,7 +54,7 @@ * software in accordance with the terms specified in this * license. * - * RCS: @(#) $Id: tkMacOSXDebug.c,v 1.8 2006/05/12 18:18:36 das Exp $ + * RCS: @(#) $Id: tkMacOSXDebug.c,v 1.9 2006/07/20 06:24:16 das Exp $ */ #include "tkMacOSXInt.h" @@ -565,7 +565,7 @@ TkMacOSXGetNamedDebugSymbol(const char* module, const char* symbol) strx = sym->n_un.n_strx; if ((sym->n_type & N_TYPE) == N_SECT && sym->n_sect == txtsectx && - strx > 0 && strx < strsize && + strx > 0 && (uint32_t) strx < strsize && strcmp(strings + strx, symbol) == 0) { addr = (void*) sym->n_value + slide; break; diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c index e12a56e..a0c2de9 100644 --- a/macosx/tkMacOSXInit.c +++ b/macosx/tkMacOSXInit.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: tkMacOSXInit.c,v 1.21 2006/05/12 18:17:48 das Exp $ + * RCS: @(#) $Id: tkMacOSXInit.c,v 1.22 2006/07/20 06:24:16 das Exp $ */ #include "tkMacOSXInt.h" @@ -45,7 +45,7 @@ */ typedef struct Map { - int numKey; + CFStringEncoding numKey; char *strKey; } Map; @@ -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: xgc.c,v 1.8 2005/11/27 02:36:16 das Exp $ + * RCS: @(#) $Id: xgc.c,v 1.9 2006/07/20 06:24:16 das Exp $ */ #include <tkInt.h> @@ -64,7 +64,7 @@ XCreateGC(display, d, mask, values) } gp->function = (mask & GCFunction) ?values->function :GXcopy; - gp->plane_mask = (mask & GCPlaneMask) ?values->plane_mask :~0; + gp->plane_mask = (mask & GCPlaneMask) ?values->plane_mask :(unsigned long )(~0); gp->foreground = (mask & GCForeground) ?values->foreground :0; gp->background = (mask & GCBackground) ?values->background :0xffffff; gp->line_width = (mask & GCLineWidth) ?values->line_width :1; |