Use SDL types, on the assumption it does a better job of figuring the…

…m out.
libsdl-org · Oct 3, 2009 · 51ab09e · 51ab09e
1 parent 6bbd26a
commit 51ab09e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/mikmod/mikmod.h b/mikmod/mikmod.h
@@ -69,6 +69,19 @@ MIKMODAPI extern long MikMod_GetVersion(void);
  *	========== Platform independent-type definitions
  */
 
+#if 1
+#include "SDL_types.h"
+
+typedef Sint8           SBYTE;      /* 1 byte, signed */
+typedef Uint8           UBYTE;      /* 1 byte, unsigned */
+typedef Sint16          SWORD;      /* 2 bytes, signed */
+typedef Uint16          UWORD;      /* 2 bytes, unsigned */
+typedef Sint32          SLONG;      /* 4 bytes, signed */
+typedef Uint32          ULONG;      /* 4 bytes, unsigned */
+typedef int             BOOL;       /* 0=false, <>0 true */
+typedef char            CHAR;
+
+#else
 #ifdef WIN32
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -111,6 +124,7 @@ typedef unsigned long   ULONG;      /* 4 bytes, unsigned */
 typedef int             BOOL;       /* 0=false, <>0 true */
 #endif
 #endif
+#endif /* 1 */
 
 /*
  *	========== Error codes

diff --git a/mikmod/mikmod_internals.h b/mikmod/mikmod_internals.h
@@ -69,6 +69,10 @@ extern "C" {
 /*========== More type definitions */
 
 /* SLONGLONG: 64bit, signed */
+#if 1
+#include "SDL_types.h"
+typedef Sint64          SLONGLONG;
+#else
 #if defined (__arch64__) || defined(__alpha) || defined(_LP64)
 typedef long		SLONGLONG;
 #define NATIVE_64BIT_INT
@@ -79,6 +83,7 @@ typedef LONGLONG	SLONGLONG;
 #else
 typedef long long	SLONGLONG;
 #endif
+#endif /* 1 */
 
 /*========== Error handling */