pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed some compiler warnings that Visual Studio reported.

Browse source
This commit is contained in:
Ryan C. Gordon 2013-07-20 19:51:51 -04:00
parent 8328f33947
commit 30b6bedb57
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/SDL_thread.h
View file

@ -49,7 +49,7 @@ typedef struct SDL_Thread SDL_Thread;
typedef unsigned long SDL_threadID; typedef unsigned long SDL_threadID;
/* Thread local storage ID, 0 is the invalid ID */ /* Thread local storage ID, 0 is the invalid ID */
typedef unsigned SDL_TLSID; typedef unsigned int SDL_TLSID;
/* The SDL thread priority /* The SDL thread priority
* *

2
src/stdlib/SDL_string.c
View file

@ -1350,7 +1350,7 @@ SDL_PrintUnsignedLongLong(char *text, size_t maxlen, SDL_FormatInfo *info, Uint6
static size_t static size_t
SDL_PrintFloat(char *text, size_t maxlen, SDL_FormatInfo *info, double arg) SDL_PrintFloat(char *text, size_t maxlen, SDL_FormatInfo *info, double arg)
{ {
int i, width; int width;
size_t len; size_t len;
size_t left = maxlen; size_t left = maxlen;
char *textstart = text; char *textstart = text;

4
src/thread/SDL_thread.c
View file

@ -57,8 +57,8 @@ SDL_TLSSet(SDL_TLSID id, const void *value, void (*destructor)(void *))
} }
storage = SDL_SYS_GetTLSData(); storage = SDL_SYS_GetTLSData();
if (!storage || id > storage->limit) { if (!storage || (id > storage->limit)) {
int i, oldlimit, newlimit; unsigned int i, oldlimit, newlimit;
oldlimit = storage ? storage->limit : 0; oldlimit = storage ? storage->limit : 0;
newlimit = (id + TLS_ALLOC_CHUNKSIZE); newlimit = (id + TLS_ALLOC_CHUNKSIZE);

2
src/thread/SDL_thread_c.h
View file

@ -58,7 +58,7 @@ extern void SDL_RunThread(void *data);
/* This is the system-independent thread local storage structure */ /* This is the system-independent thread local storage structure */
typedef struct { typedef struct {
int limit; unsigned int limit;
struct { struct {
void *data; void *data;
void (*destructor)(void*); void (*destructor)(void*);

2
src/video/SDL_surface.c
View file

@ -178,7 +178,7 @@ SDL_SetColorKey(SDL_Surface * surface, int flag, Uint32 key)
return SDL_InvalidParamError("surface"); return SDL_InvalidParamError("surface");
} }
if (surface->format->palette && key >= surface->format->palette->ncolors) { if (surface->format->palette && key >= ((Uint32) surface->format->palette->ncolors)) {
return SDL_InvalidParamError("key"); return SDL_InvalidParamError("key");
} }