Fixed bug #822

O.Sezer 2009-10-03 01:36:48 PDT During the mikmod 3.1.12 upgrade, some 64 bit ifdefs were lost.
libsdl-org · Oct 3, 2009 · 9a18bb7 · 9a18bb7
1 parent bd218ac
commit 9a18bb7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/mikmod/mikmod.h b/mikmod/mikmod.h
@@ -87,7 +87,7 @@ typedef char CHAR;
 
 
 
-#if defined(__arch64__) || defined(__alpha) || defined(__x86_64)
+#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(_LP64)
 /* 64 bit architectures */
 
 typedef signed char     SBYTE;      /* 1 byte, signed */
@@ -106,7 +106,7 @@ typedef unsigned char   UBYTE;      /* 1 byte, unsigned */
 typedef signed short    SWORD;      /* 2 bytes, signed */
 typedef unsigned short  UWORD;      /* 2 bytes, unsigned */
 typedef signed long     SLONG;      /* 4 bytes, signed */
-#if !defined(__OS2__)&&!defined(__EMX__)&&!defined(WIN32)
+#if !defined(__OS2__) && !defined(__EMX__) && !defined(_WIN32)
 typedef unsigned long   ULONG;      /* 4 bytes, unsigned */
 typedef int             BOOL;       /* 0=false, <>0 true */
 #endif

diff --git a/mikmod/mikmod_internals.h b/mikmod/mikmod_internals.h
@@ -69,7 +69,7 @@ extern "C" {
 /*========== More type definitions */
 
 /* SLONGLONG: 64bit, signed */
-#if defined (__arch64__) || defined(__alpha)
+#if defined (__arch64__) || defined(__alpha) || defined(_LP64)
 typedef long		SLONGLONG;
 #define NATIVE_64BIT_INT
 #elif defined(__WATCOMC__)