diff options
| author | das <das> | 2006-07-20 06:26:45 (GMT) |
|---|---|---|
| committer | das <das> | 2006-07-20 06:26:45 (GMT) |
| commit | e673c7b95612047bc886329eda3d26e3e7807c9b (patch) | |
| tree | fc8bec9dde27b2592c81f0797a3e93f4a2fdb7de | |
| parent | 995232e2ed50f06ad6981b713d300a8a6531571a (diff) | |
| download | tk-e673c7b95612047bc886329eda3d26e3e7807c9b.zip tk-e673c7b95612047bc886329eda3d26e3e7807c9b.tar.gz tk-e673c7b95612047bc886329eda3d26e3e7807c9b.tar.bz2 | |
* macosx/tkMacOSXCursor.c (TkMacOSXCursor):
* macosx/tkMacOSXDebug.c (TkMacOSXGetNamedDebugSymbol):
* macosx/tkMacOSXInit.c (Map): fix signed-with-unsigned comparison and
other warnings from gcc4 -Wextra.
| -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 5d155b5..e72bbae 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.4.2.3 2006/03/28 02:44:13 das Exp $ + * RCS: @(#) $Id: tkMacOSXCursor.c,v 1.4.2.4 2006/07/20 06:26:45 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 041c0e1..a8d9231 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.2.2.7 2006/05/12 18:18:52 das Exp $ + * RCS: @(#) $Id: tkMacOSXDebug.c,v 1.2.2.8 2006/07/20 06:26:45 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 312ef65..b14dff9 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.3.2.16 2006/05/12 18:17:55 das Exp $ + * RCS: @(#) $Id: tkMacOSXInit.c,v 1.3.2.17 2006/07/20 06:26:45 das Exp $ */ #include "tkMacOSXInt.h" @@ -45,7 +45,7 @@ */ typedef struct Map { - int numKey; + CFStringEncoding numKey; char *strKey; } Map; |