From 03e5bba36d7826022ae5d75da96bd3a1dbe0a827 Mon Sep 17 00:00:00 2001
From: Xerxes Rånby <xerxes@zafena.se>
Date: Tue, 29 Jan 2013 15:08:23 +0100
Subject: Remove system dependency of intptr_t and uint64_t.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Xerxes Rånby <xerxes@zafena.se>
---
 make/joal-common-CustomCCode.c        | 11 ++---------
 make/stub_includes/openal/al-types.h  | 10 ++++++++++
 make/stub_includes/openal/alc-types.h | 10 ++++++++++
 src/native/almisc.c                   |  9 ---------
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/make/joal-common-CustomCCode.c b/make/joal-common-CustomCCode.c
index 593f1d5..e620735 100755
--- a/make/joal-common-CustomCCode.c
+++ b/make/joal-common-CustomCCode.c
@@ -1,10 +1,3 @@
-#ifdef _MSC_VER /* Windows, Microsoft compilers */
-/* This typedef is apparently needed for compilers before VC8 */
-#if _MSC_VER < 1400
-typedef int intptr_t;
-#endif
-#else
-/* This header seems to be available on all other platforms */
-#include <inttypes.h>
-#endif
+#include <al-types.h>
+#include <alc-types.h>
 #include <string.h>
diff --git a/make/stub_includes/openal/al-types.h b/make/stub_includes/openal/al-types.h
index 6a609e5..e15c326 100644
--- a/make/stub_includes/openal/al-types.h
+++ b/make/stub_includes/openal/al-types.h
@@ -77,6 +77,16 @@ typedef float ALfloat;
 /** 64-bit IEEE754 floating-point */
 typedef double ALdouble;
 
+/** uint64_t */
+#if defined(_WIN64)
+        typedef unsigned __int64 uint64_t;
+#elif defined(__ia64__) || defined(__x86_64__)
+        typedef unsigned long int uint64_t;
+#else
+        typedef unsigned int uint64_t;
+#endif
+
+
 /** void type (for opaque pointers only) */
 typedef void ALvoid;
 
diff --git a/make/stub_includes/openal/alc-types.h b/make/stub_includes/openal/alc-types.h
index 222a7a8..ea96803 100644
--- a/make/stub_includes/openal/alc-types.h
+++ b/make/stub_includes/openal/alc-types.h
@@ -79,6 +79,16 @@ typedef double ALCdouble;
 /** void type (for opaque pointers only) */
 typedef void ALCvoid;
 
+/** intptr_t */
+#if defined(_WIN64)
+        typedef __int64 intptr_t;
+#elif defined(__ia64__) || defined(__x86_64__)
+        typedef long int intptr_t;
+#else
+        typedef int intptr_t;
+#endif
+
+
 #if defined(__cplusplus)
 }  /* extern "C" */
 #endif
diff --git a/src/native/almisc.c b/src/native/almisc.c
index c77cb0e..61ee599 100644
--- a/src/native/almisc.c
+++ b/src/native/almisc.c
@@ -10,15 +10,6 @@
   #define __cdecl /* Trim non-standard keyword */
  #endif
  #include "efx.h"
-  #ifdef _MSC_VER /* Windows, Microsoft compilers */
-  /* This typedef is apparently needed for compilers before VC8 */
-  #if _MSC_VER < 1400
-  typedef int intptr_t;
-  #endif
-  #else
-  /* This header seems to be available on all other platforms */
-  #include <inttypes.h>
-  #endif
   #include <string.h>
 
 
-- 
cgit v1.2.3