include/msvcrt: Make sure that __int64 is properly defined on a 64-bit platform.

include/msvcrt/direct.h

@@ -24,14 +24,18 @@ typedef unsigned short wchar_t;
 #endif
 #endif
 
-#if !defined(_MSC_VER) && !defined(__int64)
-#define __int64 long long
-#endif
-
 #if defined(__x86_64__) && !defined(_WIN64)
 #define _WIN64
 #endif
 
+#if !defined(_MSC_VER) && !defined(__int64)
+# ifdef _WIN64
+#   define __int64 long
+# else
+#   define __int64 long long
+# endif
+#endif
+
 #ifndef _SIZE_T_DEFINED
 #ifdef _WIN64
 typedef unsigned __int64 size_t;

include/msvcrt/io.h

@@ -20,8 +20,14 @@ typedef unsigned short wchar_t;
 #endif
 #endif
 
-#ifndef _MSC_VER
-# ifndef __int64
+#if defined(__x86_64__) && !defined(_WIN64)
+#define _WIN64
+#endif
+
+#if !defined(_MSC_VER) && !defined(__int64)
+# ifdef _WIN64
+#   define __int64 long
+# else
 #   define __int64 long long
 # endif
 #endif

include/msvcrt/malloc.h

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

include/msvcrt/mbstring.h

@@ -25,14 +25,18 @@
 
 #include <pshpack8.h>
 
-#if !defined(_MSC_VER) && !defined(__int64)
-#define __int64 long long
-#endif
-
 #if defined(__x86_64__) && !defined(_WIN64)
 #define _WIN64
 #endif
 
+#if !defined(_MSC_VER) && !defined(__int64)
+# ifdef _WIN64
+#   define __int64 long
+# else
+#   define __int64 long long
+# endif
+#endif
+
 #ifndef _SIZE_T_DEFINED
 #ifdef _WIN64
 typedef unsigned __int64 size_t;

include/msvcrt/search.h

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

include/msvcrt/stddef.h

@@ -27,6 +27,14 @@
 #define _WIN64
 #endif
 
+#if !defined(_MSC_VER) && !defined(__int64)
+# ifdef _WIN64
+#   define __int64 long
+# else
+#   define __int64 long long
+# endif
+#endif
+
 #ifndef _WCHAR_T_DEFINED
 #define _WCHAR_T_DEFINED
 #ifndef __cplusplus

include/msvcrt/stdio.h

@@ -17,14 +17,18 @@
 #include <stdarg.h>
 #endif
 
-#if !defined(_MSC_VER) && !defined(__int64)
-#define __int64 long long
-#endif
-
 #if defined(__x86_64__) && !defined(_WIN64)
 #define _WIN64
 #endif
 
+#if !defined(_MSC_VER) && !defined(__int64)
+# ifdef _WIN64
+#   define __int64 long
+# else
+#   define __int64 long long
+# endif
+#endif
+
 /* file._flag flags */
 #define _IOREAD          0x0001
 #define _IOWRT           0x0002

include/msvcrt/stdlib.h

@@ -28,8 +28,16 @@ typedef unsigned short wchar_t;
 #endif
 #endif
 
+#if defined(__x86_64__) && !defined(_WIN64)
+#define _WIN64
+#endif
+
 #if !defined(_MSC_VER) && !defined(__int64)
-#define __int64 long long
+# ifdef _WIN64
+#   define __int64 long
+# else
+#   define __int64 long long
+# endif
 #endif
 
 #define EXIT_SUCCESS        0

include/msvcrt/string.h

@@ -18,14 +18,18 @@ typedef unsigned short wchar_t;
 #endif
 #endif
 
-#if !defined(_MSC_VER) && !defined(__int64)
-#define __int64 long long
-#endif
-
 #if defined(__x86_64__) && !defined(_WIN64)
 #define _WIN64
 #endif
 
+#if !defined(_MSC_VER) && !defined(__int64)
+# ifdef _WIN64
+#   define __int64 long
+# else
+#   define __int64 long long
+# endif
+#endif
+
 #ifndef _SIZE_T_DEFINED
 #ifdef _WIN64
 typedef unsigned __int64 size_t;

include/msvcrt/sys/stat.h

@@ -22,12 +22,6 @@ typedef unsigned short wchar_t;
 #endif
 #endif
 
-#ifndef _MSC_VER
-# ifndef __int64
-#  define __int64 long long
-# endif
-#endif
-
 #ifndef _DEV_T_DEFINED
 typedef unsigned int _dev_t;
 #define _DEV_T_DEFINED

include/msvcrt/sys/types.h

@@ -23,14 +23,18 @@
 #define __WINE_USE_MSVCRT
 #endif
 
-#if !defined(_MSC_VER) && !defined(__int64)
-#define __int64 long long
-#endif
-
 #if defined(__x86_64__) && !defined(_WIN64)
 #define _WIN64
 #endif
 
+#if !defined(_MSC_VER) && !defined(__int64)
+# ifdef _WIN64
+#   define __int64 long
+# else
+#   define __int64 long long
+# endif
+#endif
+
 #ifndef _DEV_T_DEFINED
 typedef unsigned int   _dev_t;
 #define _DEV_T_DEFINED

include/msvcrt/time.h

@@ -32,14 +32,18 @@ typedef unsigned short wchar_t;
 #endif
 #endif
 
-#if !defined(_MSC_VER) && !defined(__int64)
-#define __int64 long long
-#endif
-
 #if defined(__x86_64__) && !defined(_WIN64)
 #define _WIN64
 #endif
 
+#if !defined(_MSC_VER) && !defined(__int64)
+# ifdef _WIN64
+#   define __int64 long
+# else
+#   define __int64 long long
+# endif
+#endif
+
 #ifndef _SIZE_T_DEFINED
 #ifdef _WIN64
 typedef unsigned __int64 size_t;

include/msvcrt/wchar.h

@@ -37,14 +37,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
-
 #if defined(__x86_64__) && !defined(_WIN64)
 #define _WIN64
 #endif
 
+#if !defined(_MSC_VER) && !defined(__int64)
+# ifdef _WIN64
+#   define __int64 long
+# else
+#   define __int64 long long
+# endif
+#endif
+
 #ifndef DECLSPEC_ALIGN
 # if defined(_MSC_VER) && (_MSC_VER >= 1300) && !defined(MIDL_PASS)
 #  define DECLSPEC_ALIGN(x) __declspec(align(x))