From a154c5dad2f0aaeee609363e5e0ff871d5a3ec9f 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 --HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402498 --- 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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 delta 2079 zcmZ{lc~BE~8^?E(P%b$|h=_t5a>^l8PDN;>NJu~qfp8;;2<4Q3sH71&O;B998W04n zf)ETVln8?s(4cZDS5aa_R1OzY4Aye`&O$ry`*x=L*Usnj+h?BN?9BIjVG?tp4|B;9 zL<+3-gGfP&Gl*~=7=s`J3qcie5P`)dH%WpBtfZ)n1rgYAi#qCv${+?rAQGMgA}|Zj zMU}UjI1abFEy4l{(a@54^iGV>e?qylxetiImF7g0A(mHBcEQdYMBoX#?@^}jP>wR*L7(;S zW8e!;d~}s4mok)p<92wRE5osFj_7%gXA8_kpT&$Zo)So5^GouYr&yCB&$r@4oEm}NU*E~P~_#_1#KB-9~xMK;jZ*-ODdo7cp>a$?$+tj~VX>n|9;Rw20H1#XU^`9u@ohnLFjVo2}&ST9bTJ*Pfo)dnPgDExC+!tU7f* zu43|vIXznS$qrvb2dXu(jy{~`!>z54D5Av6nJdP2=bbCo_1d&l&P&YlOd1d>w+MtR zX6Hn_*}$S%ythn#$@_33@uJjh$mQJYrP_9@+BaNCHl@2ZZ}Fj3QLP=fyPEqISdF~& zxJ-WZIR1wYZ?oP|W~*ysyeG?xDQ((opi|~jBV@c0#gr-P?lIV(_u|mE#t$rR@Ahxh z?x48LpV~{RS=!>xt$h?V4HfZfS7_O0Jh_h3_x<}jKaYxJ+=*D65&!@az&4psi}d^pY!(XuZbo#mpSjHORN`6E9S1% zSFwkJS}uJ{J;dR}v_)NcPZJJ^<+YlXI|PgfrT?6G)(?y3J?B%|#>4EORZ0NckDGR@ z;bj$NpVzx4+1V=d}= zyQ)jnRd=vStSjWp%V*9Yor%jzh;3oukBD@dOlYU8Kl$BMyZ0JrTkeaYm&p&4znkqk z=j=d|uyEHAi7i}PI$3jpXKz!@cFXP^FwVnwvpV-@UGt6Ht#rx(+^Gs#?q20N4 zSu{J0leFZmA*Jr~@|6}_jIQl%R_yzEgzWu8X>*08XJM17Btx}maN;+als+rdA%2&B%MKz7obOL1z4JIGvf>dDL)>0S(pk%$ED_SyCAOW9ANb zF_K~ZtDohrK9S64I0#;fW-TXD%J$R`hG5b`Cp zBr7>KWDQM18{S1wJiJ^NU>vkhMebvj|L)+F=$hL6)-c+>NRo(6ns|Pkdjme*eRjF9 zPZ0ctwt7TOl4>a)m?SE0>w$@{1no0?EP49I*D7ni+1HX?3q}scdOwbS&gWx6Ox#Qj|ztbSImNwEx{{d2Ce(a&4FIWqi`NA3eC% zWWFT#uvtiBH*;l9cjT$7_xJ=41p67UK@Z5=AV#P%WWtt!2x$ruXwage02S2Zq2x5X z|3)_4pJtB6HI}ws3zZogHH1d}4p{HJBI;~&)~jfg@pom|GuIsB1aZd6-- zl^G7LHt6+r4S2GuRq~(lUsq>pj>f-tDgd|>L5vFaUqT9y0ni5o0N^@(7?P`3hp;!b zp{QC}?CL21;#h88zgc>{CFlZ$)^CRd>6;)yy$!Y`{cn31BtmqyJ9q`6v$sMY*pArW zvNxPcjuJF>T^CAkki}*&Hds}I4fg3@@2+>Gpp^z2tW?2hidden.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