From 65994228f802a91b652efcbe40864a12cdaf565d Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Thu, 12 Jul 2007 06:53:20 +0000 Subject: [PATCH] Visual C++ compiler warning fixes --- VisualC.zip | Bin 42763 -> 45451 bytes src/file/SDL_rwops.c | 2 +- test/common.c | 6 +++--- test/loopwave.c | 2 -- test/testwm.c | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/VisualC.zip b/VisualC.zip index 3325dae716914c2a6e3783afe84a293f28dd7490..1d00902bad292fd690c03ac3cbff397a512e8ae2 100644 GIT binary patch delta 4713 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 HgtNZ@G8VR% diff --git a/src/file/SDL_rwops.c b/src/file/SDL_rwops.c index 1f66f75fa..47241a4c2 100644 --- a/src/file/SDL_rwops.c +++ b/src/file/SDL_rwops.c @@ -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 + context->hidden.win32io.buffer.size - 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); context->hidden.win32io.buffer.left -= read_ahead; diff --git a/test/common.c b/test/common.c index 361020499..e7fdb69d6 100644 --- a/test/common.c +++ b/test/common.c @@ -245,7 +245,7 @@ CommonArg(CommonState * state, int index) if (!argv[index]) { return -1; } - state->audiospec.channels = SDL_atoi(argv[index]); + state->audiospec.channels = (Uint8)SDL_atoi(argv[index]); return 2; } if (SDL_strcasecmp(argv[index], "--samples") == 0) { @@ -253,7 +253,7 @@ CommonArg(CommonState * state, int index) if (!argv[index]) { return -1; } - state->audiospec.samples = SDL_atoi(argv[index]); + state->audiospec.samples = (Uint16)SDL_atoi(argv[index]); return 2; } if ((SDL_strcasecmp(argv[index], "-h") == 0) @@ -498,7 +498,7 @@ PrintRenderer(SDL_RendererInfo * info) fprintf(stderr, ")\n"); 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) { fprintf(stderr, ", "); } diff --git a/test/loopwave.c b/test/loopwave.c index d60b08508..460662425 100644 --- a/test/loopwave.c +++ b/test/loopwave.c @@ -67,8 +67,6 @@ poked(int sig) int main(int argc, char *argv[]) { - int i, n; - /* Load the SDL library */ if (SDL_Init(SDL_INIT_AUDIO) < 0) { fprintf(stderr, "Couldn't initialize SDL: %s\n", SDL_GetError()); diff --git a/test/testwm.c b/test/testwm.c index f75460131..646239f1d 100644 --- a/test/testwm.c +++ b/test/testwm.c @@ -175,7 +175,7 @@ HotKey_Quit(void) SDL_PushEvent(&event); } -static int SDLCALL(*old_filterfunc) (void *, SDL_Event *); +static int (SDLCALL *old_filterfunc) (void *, SDL_Event *); static void *old_filterdata; int SDLCALL