diff -up libmikmod-3.2.0b3/include/mikmod.h.in.64bit libmikmod-3.2.0b3/include/mikmod.h.in
--- libmikmod-3.2.0b3/include/mikmod.h.in.64bit	2012-03-14 18:02:59.000000000 +0100
+++ libmikmod-3.2.0b3/include/mikmod.h.in	2012-04-10 06:11:45.973323955 +0200
@@ -85,7 +85,8 @@ typedef char CHAR;
 
 @DOES_NOT_HAVE_SIGNED@
 
-#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(__powerpc64__)
+#include <stdint.h>
+#if __WORDSIZE == 64
 /* 64 bit architectures */
 
 typedef signed char     SBYTE;      /* 1 byte, signed */
diff -up libmikmod-3.2.0b3/include/mikmod_internals.h.64bit libmikmod-3.2.0b3/include/mikmod_internals.h
--- libmikmod-3.2.0b3/include/mikmod_internals.h.64bit	2012-03-14 18:02:59.000000000 +0100
+++ libmikmod-3.2.0b3/include/mikmod_internals.h	2012-04-10 06:10:18.667415429 +0200
@@ -43,7 +43,8 @@ extern "C" {
 /*========== More type definitions */
 
 /* SLONGLONG: 64bit, signed */
-#if defined (__arch64__) || defined(__alpha) || defined (__x64_64) || defined (_LP64) || defined (__powerpc64__)
+#include <stdint.h>
+#if __WORDSIZE == 64
 typedef long		SLONGLONG;
 #define NATIVE_64BIT_INT
 #elif defined(__WATCOMC__)