include/msvcrt: Fix all definitions of size_t for Win64.

include/msvcrt/direct.h

@@ -22,8 +22,16 @@ typedef unsigned short wchar_t;
 #endif
 #endif
 
+#if !defined(_MSC_VER) && !defined(__int64)
+#define __int64 long long
+#endif
+
 #ifndef _SIZE_T_DEFINED
+#ifdef _WIN64
+typedef unsigned __int64 size_t;
+#else
 typedef unsigned int size_t;
+#endif
 #define _SIZE_T_DEFINED
 #endif
 

include/msvcrt/malloc.h

@@ -34,9 +34,16 @@
 #define _FREEENTRY     0
 #define _USEDENTRY     1
 
+#if !defined(_MSC_VER) && !defined(__int64)
+#define __int64 long long
+#endif
 
 #ifndef _SIZE_T_DEFINED
+#ifdef _WIN64
+typedef unsigned __int64 size_t;
+#else
 typedef unsigned int size_t;
+#endif
 #define _SIZE_T_DEFINED
 #endif
 

include/msvcrt/mbstring.h

@@ -23,8 +23,16 @@
 #define __WINE_USE_MSVCRT
 #endif
 
+#if !defined(_MSC_VER) && !defined(__int64)
+#define __int64 long long
+#endif
+
 #ifndef _SIZE_T_DEFINED
+#ifdef _WIN64
+typedef unsigned __int64 size_t;
+#else
 typedef unsigned int size_t;
+#endif
 #define _SIZE_T_DEFINED
 #endif
 

include/msvcrt/search.h

@@ -23,8 +23,16 @@
 #define __WINE_USE_MSVCRT
 #endif
 
+#if !defined(_MSC_VER) && !defined(__int64)
+#define __int64 long long
+#endif
+
 #ifndef _SIZE_T_DEFINED
+#ifdef _WIN64
+typedef unsigned __int64 size_t;
+#else
 typedef unsigned int size_t;
+#endif
 #define _SIZE_T_DEFINED
 #endif
 

include/msvcrt/stdio.h

@@ -11,15 +11,14 @@
 #define __WINE_USE_MSVCRT
 #endif
 
-#if !defined(_MSC_VER) && !defined(__int64)
-/* FIXME: not compatible, but needed for __int64 definition */
-#include <basetsd.h>
-#endif
-
 #ifndef RC_INVOKED
 #include <stdarg.h>
 #endif
 
+#if !defined(_MSC_VER) && !defined(__int64)
+#define __int64 long long
+#endif
+
 /* file._flag flags */
 #define _IOREAD          0x0001
 #define _IOWRT           0x0002
@@ -81,7 +80,11 @@ typedef __int64 fpos_t;
 #endif
 
 #ifndef _SIZE_T_DEFINED
+#ifdef _WIN64
+typedef unsigned __int64 size_t;
+#else
 typedef unsigned int size_t;
+#endif
 #define _SIZE_T_DEFINED
 #endif
 

include/msvcrt/stdlib.h

@@ -26,10 +26,8 @@ typedef unsigned short wchar_t;
 #endif
 #endif
 
-#ifndef _MSC_VER
-# ifndef __int64
-#  define __int64 long long
-# endif
+#if !defined(_MSC_VER) && !defined(__int64)
+#define __int64 long long
 #endif
 
 #define EXIT_SUCCESS        0
@@ -56,7 +54,11 @@ typedef struct _ldiv_t {
 } ldiv_t;
 
 #ifndef _SIZE_T_DEFINED
+#ifdef _WIN64
+typedef unsigned __int64 size_t;
+#else
 typedef unsigned int size_t;
+#endif
 #define _SIZE_T_DEFINED
 #endif
 

include/msvcrt/sys/types.h

@@ -23,6 +23,10 @@
 #define __WINE_USE_MSVCRT
 #endif
 
+#if !defined(_MSC_VER) && !defined(__int64)
+#define __int64 long long
+#endif
+
 #ifndef _DEV_T_DEFINED
 typedef unsigned int   _dev_t;
 #define _DEV_T_DEFINED
@@ -67,7 +71,11 @@ typedef int pid_t;
 #endif
 
 #ifndef _SSIZE_T_DEFINED
+#ifdef _WIN64
+typedef __int64 ssize_t;
+#else
 typedef int ssize_t;
+#endif
 #define _SSIZE_T_DEFINED
 #endif
 

include/msvcrt/time.h

@@ -30,8 +30,16 @@ typedef unsigned short wchar_t;
 #endif
 #endif
 
+#if !defined(_MSC_VER) && !defined(__int64)
+#define __int64 long long
+#endif
+
 #ifndef _SIZE_T_DEFINED
+#ifdef _WIN64
+typedef unsigned __int64 size_t;
+#else
 typedef unsigned int size_t;
+#endif
 #define _SIZE_T_DEFINED
 #endif
 

include/msvcrt/wchar.h

@@ -35,10 +35,18 @@ typedef unsigned short wchar_t;
 #define WCHAR_MIN 0
 #define WCHAR_MAX ((wchar_t)-1)
 
+#if !defined(_MSC_VER) && !defined(__int64)
+#define __int64 long long
+#endif
+
 typedef int mbstate_t;
 
 #ifndef _SIZE_T_DEFINED
+#ifdef _WIN64
+typedef unsigned __int64 size_t;
+#else
 typedef unsigned int size_t;
+#endif
 #define _SIZE_T_DEFINED
 #endif
 
@@ -48,12 +56,6 @@ typedef unsigned short  wctype_t;
 #define _WCTYPE_T_DEFINED
 #endif
 
-#ifndef _MSC_VER
-# ifndef __int64
-#  define __int64 long long
-# endif
-#endif
-
 #ifndef WEOF
 #define WEOF        (wint_t)(0xFFFF)
 #endif