define S_ISDIR for win32 #94

Followup on #383. Signed-off-by: Rafael Kitover <rkitover@gmail.com>
visualboyadvance-m · Mar 7, 2019 · 6a98f3c20008bf0d281fda85005f4e318a59e847 · 6a98f3c · denisfa · Mar 7, 2019
1 parent 7373da1
commit 6a98f3c20008bf0d281fda85005f4e318a59e847
Unified Split

Showing with 9 additions and 3 deletions.

+5 −2 src/common/ConfigManager.cpp

+4 −1 src/sdl/SDL.cpp
diff --git a/src/common/ConfigManager.cpp b/src/common/ConfigManager.cpp
@@ -40,7 +40,10 @@ extern "C" {
 #define snprintf sprintf
 #define stat _stat
 #define mkdir(X,Y) (_mkdir(X))
-#define S_ISDIR _S_IFDIR
+// from: https://www.linuxquestions.org/questions/programming-9/porting-to-win32-429334/
+#ifndef S_ISDIR
+    #define S_ISDIR(mode)  (((mode) & _S_IFMT) == _S_IFDIR)
+#endif
 #endif // _WIN32
 
 #ifndef __GNUC__
@@ -679,7 +682,7 @@ const char* FindConfigFile(const char *name)
 			while (tok) {
 				sprintf(path, "%s%c%s", tok, FILE_SEP, EXE_NAME);
 				if (FileExists(path)) {
-					char path2[2048];
+					static char path2[2048];
 					sprintf(path2, "%s%c%s", tok, FILE_SEP, name);
 					if (FileExists(path2)) {
 						return path2;

diff --git a/src/sdl/SDL.cpp b/src/sdl/SDL.cpp
@@ -73,7 +73,10 @@
 #define snprintf sprintf
 #define stat _stat
 #define mkdir(X,Y) (_mkdir(X))
-#define S_ISDIR _S_IFDIR
+// from: https://www.linuxquestions.org/questions/programming-9/porting-to-win32-429334/
+#ifndef S_ISDIR
+    #define S_ISDIR(mode)  (((mode) & _S_IFMT) == _S_IFDIR)
+#endif
 #endif // _WIN32
 
 #ifndef __GNUC__