diff options
author | das <das> | 2006-07-20 06:24:16 (GMT) |
---|---|---|
committer | das <das> | 2006-07-20 06:24:16 (GMT) |
commit | 516d2a2413bfa3330b641f88c3a940a54f790a60 (patch) | |
tree | 956bfb461f8842d898de94327db9578248dbf9cf /macosx | |
parent | bdce7878d48dd817db9215c36c9c4794740d4bfb (diff) | |
download | tk-516d2a2413bfa3330b641f88c3a940a54f790a60.zip tk-516d2a2413bfa3330b641f88c3a940a54f790a60.tar.gz tk-516d2a2413bfa3330b641f88c3a940a54f790a60.tar.bz2 |
* generic/tkImgGIF.c (ReadImage):
* macosx/tkMacOSXCursor.c (TkMacOSXCursor):
* macosx/tkMacOSXDebug.c (TkMacOSXGetNamedDebugSymbol):
* macosx/tkMacOSXInit.c (Map):
* xlib/xgc.c (XCreateGC): fix signed-with-unsigned comparison and other
warnings from gcc4 -Wextra.
Diffstat (limited to 'macosx')
-rw-r--r-- | macosx/tkMacOSXCursor.c | 4 | ||||
-rw-r--r-- | macosx/tkMacOSXDebug.c | 4 | ||||
-rw-r--r-- | macosx/tkMacOSXInit.c | 4 |
3 files changed, 6 insertions, 6 deletions
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; |