fix build on msys2 ucrt64

recent version of msys2 runtime define macros for __argc in /ucrt64/include/stdlib.h, that clash with our declaration of getopt_long. Reorder the includes to workaround the define issue and fix compilation.
dciabrin · Jan 10, 2025 · 018eac9 · 018eac9
1 parent 2727eb3
commit 018eac9
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/conf.c b/src/conf.c
@@ -21,6 +21,12 @@
 #include <config.h>
 #endif
 
+#ifdef HAVE_GETOPT_LONG
+#include <getopt.h>
+#else
+#include "getopt.h"
+#endif
+
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
@@ -29,12 +35,6 @@
 #include <unistd.h>
 #include <dirent.h>
 
-#ifdef HAVE_GETOPT_LONG
-#include <getopt.h>
-#else
-#include "getopt.h"
-#endif
-
 #include <zlib.h>
 #include "unzip.h"
 #include "SDL.h"