Merge branch 'master' of github.com:Themaister/SSNES

This commit is contained in:
TwinAphex51224 2012-01-05 22:47:54 +01:00
commit 00459365c4

View File

@ -605,7 +605,7 @@ static void parse_input(int argc, char *argv[])
int val = 0; int val = 0;
struct option opts[] = { const struct option opts[] = {
#ifdef HAVE_DYNAMIC #ifdef HAVE_DYNAMIC
{ "libsnes", 1, NULL, 'L' }, { "libsnes", 1, NULL, 'L' },
#endif #endif
@ -673,7 +673,7 @@ static void parse_input(int argc, char *argv[])
#define NETPLAY_ARG #define NETPLAY_ARG
#endif #endif
char optstring[] = "hs:fvS:m:p4jJg:b:B:Y:Z:P:R:M:U:DN:X:" NETPLAY_ARG DYNAMIC_ARG FFMPEG_RECORD_ARG CONFIG_FILE_ARG; const char *optstring = "hs:fvS:m:p4jJg:b:B:Y:Z:P:R:M:U:DN:X:" NETPLAY_ARG DYNAMIC_ARG FFMPEG_RECORD_ARG CONFIG_FILE_ARG;
for (;;) for (;;)
{ {
val = 0; val = 0;