8 files changed, 12 insertions, 85 deletions
diff --git a/src/jogl/native/openmax/omx_tool.h b/src/jogl/native/openmax/omx_tool.h
index dbc375dd7..d566507c1 100644
--- a/src/jogl/native/openmax/omx_tool.h
+++ b/src/jogl/native/openmax/omx_tool.h
@@ -10,25 +10,10 @@
     // __declspec(dllimport) void __stdcall Sleep(unsigned long dwMilliseconds);
 
     #define usleep(t)    Sleep((t) / 1000)
-
-    #ifdef _MSC_VER
-        /* This typedef is apparently needed for Microsoft compilers before VC8,
-           and on Windows CE */
-        #if !defined(__MINGW64__) && ( defined(UNDER_CE) || _MSC_VER <= 1400 )
-            #ifdef _WIN64
-                typedef long long intptr_t;
-            #else
-                typedef int intptr_t;
-            #endif
-        #endif
-    #else
-        #include <inttypes.h>
-    #endif
-#else
-    #include <unistd.h>
-    #include <inttypes.h>
 #endif
 
+#include <gluegen_stdint.h>
+
 #include <OMX_Core.h>
 #include <OMX_Component.h>
 #include <OMX_Index.h>
diff --git a/src/nativewindow/native/windows/GDImisc.c b/src/nativewindow/native/windows/GDImisc.c
index 9bead17ec..e8285008e 100644
--- a/src/nativewindow/native/windows/GDImisc.c
+++ b/src/nativewindow/native/windows/GDImisc.c
@@ -9,23 +9,7 @@
 #include <wingdi.h>
 #include <stddef.h>
 
-#ifdef _WIN32
-  #ifdef _MSC_VER
-   /* This typedef is apparently needed for Microsoft compilers before VC8,
-      and on Windows CE */
-   #if (_MSC_VER < 1400) || defined(UNDER_CE)
-    #ifdef _WIN64
-     typedef long long intptr_t;
-    #else
-     typedef int intptr_t;
-    #endif
-   #endif
-  #else
-   #include <inttypes.h>
-  #endif
-#else
-  #include <inttypes.h>
-#endif
+#include <gluegen_stdint.h>
 
 #include <stdio.h>
 
diff --git a/src/nativewindow/native/x11/XineramaHelper.c b/src/nativewindow/native/x11/XineramaHelper.c
index 899bbba55..25a79645b 100644
--- a/src/nativewindow/native/x11/XineramaHelper.c
+++ b/src/nativewindow/native/x11/XineramaHelper.c
@@ -35,7 +35,7 @@
    determine whether the Xinerama extension is in use and therefore to
    treat the multiple AWT screens as one large screen. */
 
-#include <inttypes.h>
+#include <gluegen_stdint.h>
 #include <X11/Xlib.h>
 
 #ifdef __sun
diff --git a/src/newt/native/BroadcomEGL.c b/src/newt/native/BroadcomEGL.c
index 0cca90420..80b482130 100644
--- a/src/newt/native/BroadcomEGL.c
+++ b/src/newt/native/BroadcomEGL.c
@@ -31,11 +31,7 @@
  * 
  */
 
-#ifdef _WIN32
-  #include <windows.h>
-#else
-  #include <inttypes.h>
-#endif
+#include <gluegen_stdint.h>
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/newt/native/IntelGDL.c b/src/newt/native/IntelGDL.c
index 953181ccc..e287ad1fa 100644
--- a/src/newt/native/IntelGDL.c
+++ b/src/newt/native/IntelGDL.c
@@ -31,7 +31,7 @@
  * 
  */
 
-#include <inttypes.h>
+#include <gluegen_stdint.h>
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/newt/native/KDWindow.c b/src/newt/native/KDWindow.c
index be0488fd1..b314f9d44 100644
--- a/src/newt/native/KDWindow.c
+++ b/src/newt/native/KDWindow.c
@@ -39,27 +39,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#ifdef _WIN32
-    /* This typedef is apparently needed for Microsoft compilers before VC8,
-       and on Windows CE */
-    #if !defined(__MINGW64__) && ( defined(UNDER_CE) || _MSC_VER <= 1400 )
-        #ifdef _WIN64
-            typedef long long intptr_t;
-        #else
-            typedef int intptr_t;
-        #endif
-    #elif !defined(__MINGW64__) && _MSC_VER <= 1500
-        #ifdef _WIN64 // [
-            typedef __int64           intptr_t;
-        #else // _WIN64 ][
-            typedef int               intptr_t;
-        #endif // _WIN64 ]
-    #else
-        #include <inttypes.h>
-    #endif
-#else
-    #include <inttypes.h>
-#endif
+#include <gluegen_stdint.h>
 
 #include <KD/kd.h>
 
diff --git a/src/newt/native/WindowsWindow.c b/src/newt/native/WindowsWindow.c
index 95f036b39..5e666631b 100644
--- a/src/newt/native/WindowsWindow.c
+++ b/src/newt/native/WindowsWindow.c
@@ -36,28 +36,13 @@
 #include <Windowsx.h>
 #include <tchar.h>
 #include <stdlib.h>
+
 // NOTE: it looks like SHFullScreen and/or aygshell.dll is not available on the APX 2500 any more
 // #ifdef UNDER_CE
 // #include "aygshell.h"
 // #endif
 
-/* This typedef is apparently needed for Microsoft compilers before VC8,
-   and on Windows CE and MingW32  */
-#if !defined(__MINGW64__) && ( defined(UNDER_CE) || _MSC_VER <= 1400 )
-    #ifdef _WIN64
-        typedef long long intptr_t;
-    #else
-        typedef int intptr_t;
-    #endif
-#elif !defined(__MINGW64__) && _MSC_VER <= 1500
-    #ifdef _WIN64 // [
-        typedef __int64           intptr_t;
-    #else // _WIN64 ][
-        typedef int               intptr_t;
-    #endif // _WIN64 ]
-#else
-    #include <inttypes.h>
-#endif
+#include <gluegen_stdint.h>
 
 #if !defined(__MINGW64__) && _MSC_VER <= 1500
     // FIXME: Determine for which MSVC versions ..
diff --git a/src/newt/native/X11Window.c b/src/newt/native/X11Window.c
index 53dd97d44..5414de966 100644
--- a/src/newt/native/X11Window.c
+++ b/src/newt/native/X11Window.c
@@ -36,12 +36,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
-// Building on obsolete platform on SPARC right now
-#ifdef __sparc
-  #include <inttypes.h>
-#else
-  #include <stdint.h>
-#endif
+
+#include <gluegen_stdint.h>
+
 #include <unistd.h>
 #include <errno.h>
 #include <X11/Xlib.h>