From 62d70494373202dbddbf6a6394621bfb74c470fb Mon Sep 17 00:00:00 2001 From: Sryder Date: Sun, 7 Oct 2018 15:44:44 +0100 Subject: [PATCH 1/2] I'm fairly sure GCC64 should enable GCC63. No wonder I never got mixed declaration and code warnings. --- src/Makefile.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.cfg b/src/Makefile.cfg index 68cced815..5f0096d63 100644 --- a/src/Makefile.cfg +++ b/src/Makefile.cfg @@ -20,7 +20,7 @@ GCC64=1 endif ifdef GCC64 -GCC64=1 +GCC63=1 endif ifdef GCC63 From bc1f08f89dbc999e19173ed656b6ee140ed54271 Mon Sep 17 00:00:00 2001 From: Sryder Date: Thu, 29 Nov 2018 22:12:14 +0000 Subject: [PATCH 2/2] Fix 2 of the Unsuffixed Float Constant warnings The other one is related to M_PI for me, which I'm still not sure about where it's getting it from --- src/m_anigif.c | 4 ++-- src/sdl/mixer_sound.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/m_anigif.c b/src/m_anigif.c index 845099211..4e68819bc 100644 --- a/src/m_anigif.c +++ b/src/m_anigif.c @@ -492,8 +492,8 @@ static void GIF_framewrite(void) // screen regions are handled in GIF_lzw { - int d1 = (int)((100.0/NEWTICRATE)*(gif_frames+1)); - int d2 = (int)((100.0/NEWTICRATE)*(gif_frames)); + int d1 = (int)((100.0f/NEWTICRATE)*(gif_frames+1)); + int d2 = (int)((100.0f/NEWTICRATE)*(gif_frames)); UINT16 delay = d1-d2; INT32 startline; diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c index a3c421991..3f9b09f10 100644 --- a/src/sdl/mixer_sound.c +++ b/src/sdl/mixer_sound.c @@ -50,8 +50,8 @@ #ifdef HAVE_LIBGME #include "gme/gme.h" -#define GME_TREBLE 5.0 -#define GME_BASS 1.0 +#define GME_TREBLE 5.0f +#define GME_BASS 1.0f #ifdef HAVE_ZLIB #ifndef _MSC_VER