From e20bf69ac5adf3607c6e60ffdd5a0bb40b8f11ed Mon Sep 17 00:00:00 2001
From: grischka <grischka>
Date: Thu, 14 Jan 2010 20:56:35 +0100
Subject: win64: defined size_t and ptrdiff_t to unsigned long long

---
 win32/include/_mingw.h | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

(limited to 'win32/include')

diff --git a/win32/include/_mingw.h b/win32/include/_mingw.h
index 04fc1ca..d876625 100644
--- a/win32/include/_mingw.h
+++ b/win32/include/_mingw.h
@@ -58,28 +58,27 @@
 #define _CRT_WIDE(_String) __CRT_WIDE(_String)
 
 #ifdef _WIN64
-# define _INTEGRAL_MAX_BITS 64
-typedef __int64 intptr_t;
-typedef __int64 ptrdiff_t;
-typedef unsigned __int64 uintptr_t;
-# define __stdcall
-# define _AMD64_ 1
-# define __x86_64 1
-# define USE_MINGW_SETJMP_TWO_ARGS
-# define mingw_getsp tinyc_getbp
+#define __stdcall
+#define _AMD64_ 1
+#define __x86_64 1
+#define USE_MINGW_SETJMP_TWO_ARGS
+#define mingw_getsp tinyc_getbp
 #else
-# define _INTEGRAL_MAX_BITS 32
-typedef __int32 intptr_t;
-typedef __int32 ptrdiff_t;
-typedef unsigned __int32 uintptr_t;
-# define __stdcall __attribute__((__stdcall__))
-# define _X86_ 1
-# define WIN32 1
-# define _USE_32BIT_TIME_T
+#define __stdcall __attribute__((__stdcall__))
+#define _X86_ 1
+#define WIN32 1
+#define _USE_32BIT_TIME_T
 #endif
+
+/* in stddef.h */
+#define _SIZE_T_DEFINED
+#define _SSIZE_T_DEFINED
+#define _PTRDIFF_T_DEFINED
+#define _WCHAR_T_DEFINED
 #define _UINTPTR_T_DEFINED
 #define _INTPTR_T_DEFINED
-#define _PTRDIFF_T_DEFINED
+
+#define _INTEGRAL_MAX_BITS 64
 
 typedef long __time32_t;
 #define _TIME32_T_DEFINED
-- 
cgit v1.3.1