Fix compilation (MinGW)

SAPikachu · Mar 11, 2015 · 55bcc2c · 55bcc2c
1 parent cbadc9f
commit 55bcc2c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/include/f3kdb.h b/include/f3kdb.h
@@ -82,7 +82,7 @@ enum
 # define F3KDB_EXTERNAL_API(ret) F3KDB_EXTERN_C ret F3KDB_CC
 #endif
 
-#if !defined(FLASH3KYUU_DEBAND_EXPORTS) && defined(_WIN32) && !defined(F3KDB_STATIC)
+#if !defined(FLASH3KYUU_DEBAND_EXPORTS) && defined(_WIN32) && !defined(F3KDB_STATIC) && !defined(__GNUC__)
 # define F3KDB_API(ret) F3KDB_EXTERN_C __declspec(dllimport) ret F3KDB_CC
 #else
 # define F3KDB_API(ret) F3KDB_EXTERNAL_API(ret)

diff --git a/src/compiler_compat.h b/src/compiler_compat.h
@@ -16,21 +16,23 @@
 #define __PRAGMA_NOUNROLL__
 #endif
 
-#ifndef _WIN32
-#define __forceinline inline
-#ifndef __cdecl
-#define __cdecl
-#endif
-#define InterlockedCompareExchangePointer(a,b,c) __sync_val_compare_and_swap(a,c,b)
-
+#if defined(__GNUC__) || defined(__clang__)
 #include <cstring>
-#include <cstdlib>
+#include <stdio.h>
 
 #define stricmp strcasecmp
 #define strnicmp strncasecmp
 #define _stricmp strcasecmp
 #define _strnicmp strncasecmp
 #define _snprintf snprintf
+#endif
+
+#ifndef _WIN32
+#define __forceinline inline
+#ifndef __cdecl
+#define __cdecl
+#endif
+#define InterlockedCompareExchangePointer(a,b,c) __sync_val_compare_and_swap(a,c,b)
 
 static inline void* _aligned_malloc(size_t size, size_t alignment)
 {