ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build on Mingw CXX_BUILD.

This commit is contained in:
Themaister 2012-03-30 19:15:18 +02:00
parent 5d4e32ef9d
commit 35a9123bf8
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compat/getopt_ssnes.h
View File

@ -32,6 +32,10 @@
// Avoid possible naming collitions during link since we prefer to use the actual name. // 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) #define getopt_long(argc, argv, optstring, longopts, longindex) __getopt_long_ssnes(argc, argv, optstring, longopts, longindex)
#ifdef __cplusplus
extern "C" {
#endif
struct option struct option
{ {
const char *name; const char *name;
@ -46,6 +50,9 @@ int getopt_long(int argc, char *argv[],
const char *optstring, const struct option *longopts, int *longindex); const char *optstring, const struct option *longopts, int *longindex);
extern char *optarg; extern char *optarg;
extern int optind, opterr, optopt; extern int optind, opterr, optopt;
#ifdef __cplusplus
}
#endif
#endif #endif
#endif #endif

2
input/dinput.c
View File

@ -69,7 +69,7 @@ static BOOL CALLBACK enum_joypad_cb(const DIDEVICEINSTANCE *inst, void *p)
unsigned n; unsigned n;
for (n = 0; n < MAX_PLAYERS; 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; break;
if (di->joypad[n]) if (di->joypad[n])