From 95bea3468a00439ef9d7bbc542e562a7bc0452e3 Mon Sep 17 00:00:00 2001 From: darkstar Date: Tue, 9 Oct 2018 13:27:27 +0200 Subject: [PATCH 1/3] Fix unreferenced variable warning in game.c When logging is disabled, this variable is not needed --- src/devices/ports/game.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/devices/ports/game.c b/src/devices/ports/game.c index 11c783c..200fda9 100644 --- a/src/devices/ports/game.c +++ b/src/devices/ports/game.c @@ -79,9 +79,9 @@ int game_do_log = ENABLE_GAME_LOG; void game_log(int level, const char *fmt, ...) { - va_list ap; - #ifdef ENABLE_GAME_LOG + va_list ap; + if (game_do_log >= level) { va_start(ap, fmt); pclog_ex(fmt, ap); From 96d7e0a29ba1d0c2e77920b63cc9912606379c57 Mon Sep 17 00:00:00 2001 From: darkstar Date: Wed, 10 Oct 2018 23:56:19 +0200 Subject: [PATCH 2/3] Fix #defines for MSVC for proper format specifiers Also enable fluidsynth if the DLL is present --- src/win/msvc/vc15/global.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/win/msvc/vc15/global.props b/src/win/msvc/vc15/global.props index 92ab33c..1c090df 100644 --- a/src/win/msvc/vc15/global.props +++ b/src/win/msvc/vc15/global.props @@ -7,7 +7,7 @@ - _USE_MATH_DEFINES;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;USE_DYNAREC;USE_OPENAL;USE_SDL + _USE_MATH_DEFINES;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_STDIO_ISO_WIDE_SPECIFIERS;USE_DYNAREC;USE_OPENAL;USE_SDL;USE_FLUIDSYNTH From f1e671baf10db4812de8b1b0392c2015f059862c Mon Sep 17 00:00:00 2001 From: darkstar Date: Thu, 11 Oct 2018 15:00:42 +0200 Subject: [PATCH 3/3] Fix include guard --- src/devices/network/net_3com.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/devices/network/net_3com.h b/src/devices/network/net_3com.h index 7111428..8312c59 100644 --- a/src/devices/network/net_3com.h +++ b/src/devices/network/net_3com.h @@ -32,7 +32,7 @@ * Boston, MA 02111-1307 * USA. */ -#ifndef NET_3COME_H +#ifndef NET_3COM_H # define NET_3COM_H