Merge pull request #729 from FtZPetruska/fix-mingw-warnings

Fix warnings on mingw

Author: rfomin

prboom2/src/SDL/i_sndfile.c

@@ -51,7 +51,7 @@ static sf_count_t sfvio_tell(void *user_data)
   return mem_ftell((MEMFILE *)user_data);
 } 
 
-void *Load_SNDFile(void *data, SDL_AudioSpec *sample, void **sampledata,
+void *Load_SNDFile(const void *data, SDL_AudioSpec *sample, void **sampledata,
                    Uint32 *samplelen)
 {
   SNDFILE *sndfile;

prboom2/src/SDL/i_sndfile.h

@@ -18,7 +18,7 @@
 
 #include "SDL_audio.h"
 
-void *Load_SNDFile(void *data, SDL_AudioSpec *sample, void **sampledata,
+void *Load_SNDFile(const void *data, SDL_AudioSpec *sample, void **sampledata,
 				   Uint32 *samplelen);
 
 #endif

prboom2/src/SDL/i_sound.c

@@ -234,7 +234,7 @@ static snd_data_t *GetSndData(int sfxid, const unsigned char *data, size_t len)
     void *sampledata;
     Uint32 samplelen = (Uint32)len;
 
-    if (Load_SNDFile((void *)data, &sample, &sampledata, &samplelen) == NULL)
+    if (Load_SNDFile(data, &sample, &sampledata, &samplelen) == NULL)
     {
       lprintf(LO_WARN, "Can't open sfx file: %s\n", S_sfx[sfxid].name);
       return NULL;

prboom2/src/e6y.c

@@ -732,7 +732,7 @@ int force_singletics_to = 0;
 
 int HU_DrawDemoProgress(int force)
 {
-  extern float mouse_hide_timer;
+  extern int mouse_hide_timer;
   static unsigned int last_update = 0;
   static int prev_len = -1;
 

prboom2/src/f_finale.c

@@ -825,7 +825,7 @@ void F_BunnyScroll (void)
     laststage = stage;
   }
 
-  sprintf (name,"END%i",stage);
+  snprintf(name, sizeof name, "END%i", stage);
   // CPhipps - patch drawing updated
   V_DrawNamePatch((320-13*8)/2, (200-8*8)/2, 0, name, CR_DEFAULT, VPT_STRETCH);
 }