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

Visual C++ compiler warning fixes

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402498
This commit is contained in:
Sam Lantinga 2007-07-12 06:53:20 +00:00
parent a3245a4e7c
commit a154c5dad2
5 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
VisualC.zip
View file

Binary file not shown.

2
src/file/SDL_rwops.c
View file

@ -191,7 +191,7 @@ win32_file_read(SDL_RWops * context, void *ptr, size_t size, size_t maxnum)
void *data = (char *) context->hidden.win32io.buffer.data + void *data = (char *) context->hidden.win32io.buffer.data +
context->hidden.win32io.buffer.size - context->hidden.win32io.buffer.size -
context->hidden.win32io.buffer.left; context->hidden.win32io.buffer.left;
read_ahead = SDL_min(total_need, context->hidden.win32io.buffer.left); read_ahead = SDL_min(total_need, (size_t)context->hidden.win32io.buffer.left);
SDL_memcpy(ptr, data, read_ahead); SDL_memcpy(ptr, data, read_ahead);
context->hidden.win32io.buffer.left -= read_ahead; context->hidden.win32io.buffer.left -= read_ahead;

6
test/common.c
View file

@ -245,7 +245,7 @@ CommonArg(CommonState * state, int index)
if (!argv[index]) { if (!argv[index]) {
return -1; return -1;
} }
state->audiospec.channels = SDL_atoi(argv[index]); state->audiospec.channels = (Uint8)SDL_atoi(argv[index]);
return 2; return 2;
} }
if (SDL_strcasecmp(argv[index], "--samples") == 0) { if (SDL_strcasecmp(argv[index], "--samples") == 0) {
@ -253,7 +253,7 @@ CommonArg(CommonState * state, int index)
if (!argv[index]) { if (!argv[index]) {
return -1; return -1;
} }
state->audiospec.samples = SDL_atoi(argv[index]); state->audiospec.samples = (Uint16)SDL_atoi(argv[index]);
return 2; return 2;
} }
if ((SDL_strcasecmp(argv[index], "-h") == 0) if ((SDL_strcasecmp(argv[index], "-h") == 0)
@ -498,7 +498,7 @@ PrintRenderer(SDL_RendererInfo * info)
fprintf(stderr, ")\n"); fprintf(stderr, ")\n");
fprintf(stderr, " Texture formats (%d): ", info->num_texture_formats); fprintf(stderr, " Texture formats (%d): ", info->num_texture_formats);
for (i = 0; i < info->num_texture_formats; ++i) { for (i = 0; i < (int)info->num_texture_formats; ++i) {
if (i > 0) { if (i > 0) {
fprintf(stderr, ", "); fprintf(stderr, ", ");
} }

2
test/loopwave.c
View file

@ -67,8 +67,6 @@ poked(int sig)
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
int i, n;
/* Load the SDL library */ /* Load the SDL library */
if (SDL_Init(SDL_INIT_AUDIO) < 0) { if (SDL_Init(SDL_INIT_AUDIO) < 0) {
fprintf(stderr, "Couldn't initialize SDL: %s\n", SDL_GetError()); fprintf(stderr, "Couldn't initialize SDL: %s\n", SDL_GetError());

2
test/testwm.c
View file

@ -175,7 +175,7 @@ HotKey_Quit(void)
SDL_PushEvent(&event); SDL_PushEvent(&event);
} }
static int SDLCALL(*old_filterfunc) (void *, SDL_Event *); static int (SDLCALL *old_filterfunc) (void *, SDL_Event *);
static void *old_filterdata; static void *old_filterdata;
int SDLCALL int SDLCALL