From 35a9123bf800346e596c69994089e16ade97b246 Mon Sep 17 00:00:00 2001 From: Themaister Date: Fri, 30 Mar 2012 19:15:18 +0200 Subject: [PATCH] Fix build on Mingw CXX_BUILD. --- compat/getopt_ssnes.h | 7 +++++++ input/dinput.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/compat/getopt_ssnes.h b/compat/getopt_ssnes.h index 219eb864b2..4c2204ace5 100644 --- a/compat/getopt_ssnes.h +++ b/compat/getopt_ssnes.h @@ -32,6 +32,10 @@ // Avoid possible naming collitions during link since we prefer to use the actual name. #define getopt_long(argc, argv, optstring, longopts, longindex) __getopt_long_ssnes(argc, argv, optstring, longopts, longindex) +#ifdef __cplusplus +extern "C" { +#endif + struct option { const char *name; @@ -46,6 +50,9 @@ int getopt_long(int argc, char *argv[], const char *optstring, const struct option *longopts, int *longindex); extern char *optarg; extern int optind, opterr, optopt; +#ifdef __cplusplus +} +#endif #endif #endif diff --git a/input/dinput.c b/input/dinput.c index 76cc522aa0..7bfea8873a 100644 --- a/input/dinput.c +++ b/input/dinput.c @@ -69,7 +69,7 @@ static BOOL CALLBACK enum_joypad_cb(const DIDEVICEINSTANCE *inst, void *p) unsigned n; for (n = 0; n < MAX_PLAYERS; n++) { - if (!di->joypad[n] && g_settings.input.joypad_map[n] == di->joypad_cnt) + if (!di->joypad[n] && g_settings.input.joypad_map[n] == (int)di->joypad_cnt) break; if (di->joypad[n])