From f50c85e75fb1a7482c9fcb51edb0bb2152ee6647 Mon Sep 17 00:00:00 2001
From: Colin Finck <colin@reactos.org>
Date: Mon, 12 May 2008 15:59:31 +0000
Subject: [PATCH] Remove all remaining occurrences of the W64 macro. The __w64
 setting is obsolete beginning with MSVC 2008.

svn path=/trunk/; revision=33475
---
 reactos/include/host/typedefs.h | 12 ++----------
 reactos/include/psdk/basetsd.h  | 34 +++++++++++++--------------------
 2 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/reactos/include/host/typedefs.h b/reactos/include/host/typedefs.h
index 1be9e71242a..bdc4d3763e2 100644
--- a/reactos/include/host/typedefs.h
+++ b/reactos/include/host/typedefs.h
@@ -14,14 +14,6 @@
 #include <stdlib.h>
 #include <limits.h>
 
-#if defined(_MSC_VER)
-#define W64 __w64
-#elif defined(__GNUC__)
-#define W64
-#else
-#error Unknown compiler
-#endif
-
 /* Function attributes for GCC */
 #if !defined(_MSC_VER) && !defined(__fastcall)
 #define __fastcall __attribute__((fastcall))
@@ -74,8 +66,8 @@ typedef int INT;
 typedef unsigned int UINT, *PUINT, *LPUINT, UINT_PTR, *PUINT_PTR;
 typedef UCHAR BOOLEAN, *PBOOLEAN;
 typedef int BOOL;
-typedef long int W64 LONG_PTR, *PLONG_PTR;
-typedef long unsigned int W64 ULONG_PTR, DWORD_PTR, *PULONG_PTR;
+typedef long int LONG_PTR, *PLONG_PTR;
+typedef long unsigned int ULONG_PTR, DWORD_PTR, *PULONG_PTR;
 typedef ULONG_PTR SIZE_T, *PSIZE_T;
 typedef unsigned short WCHAR, *PWCHAR, *PWSTR, *LPWSTR;
 typedef const unsigned short *PCWSTR, *LPCWSTR;
diff --git a/reactos/include/psdk/basetsd.h b/reactos/include/psdk/basetsd.h
index f7519a61590..f17435ae6e5 100644
--- a/reactos/include/psdk/basetsd.h
+++ b/reactos/include/psdk/basetsd.h
@@ -4,14 +4,6 @@
 #pragma GCC system_header
 #endif
 
-#ifndef _W64
-#if defined(_MSC_VER) && !defined(MIDL_PASS) && _MSC_VER >= 1300
-#define _W64 __w64
-#else
-#define _W64
-#endif
-#endif
-
 #ifdef __GNUC__
 #ifndef __int64
 #define __int64 long long
@@ -65,11 +57,11 @@ typedef unsigned int DWORD32, *PDWORD32;
 typedef unsigned int UINT32, *PUINT32;
 
 #if defined(_WIN64)
-typedef _W64 __int64 INT_PTR, *PINT_PTR;
-typedef _W64 unsigned __int64 UINT_PTR, *PUINT_PTR;
-typedef _W64 __int64 LONG_PTR, *PLONG_PTR;
-typedef _W64 unsigned __int64 ULONG_PTR, *PULONG_PTR;
-typedef _W64 unsigned __int64 HANDLE_PTR;
+typedef __int64 INT_PTR, *PINT_PTR;
+typedef unsigned __int64 UINT_PTR, *PUINT_PTR;
+typedef __int64 LONG_PTR, *PLONG_PTR;
+typedef unsigned __int64 ULONG_PTR, *PULONG_PTR;
+typedef unsigned __int64 HANDLE_PTR;
 typedef unsigned int UHALF_PTR, *PUHALF_PTR;
 typedef int HALF_PTR, *PHALF_PTR;
 
@@ -105,13 +97,13 @@ inline void* ULongToPtr( const unsigned long ul )
 #endif /* 0_ */
 
 #else /*  !_WIN64 */
-typedef _W64 int INT_PTR, *PINT_PTR;
-typedef _W64 unsigned int UINT_PTR, *PUINT_PTR;
+typedef int INT_PTR, *PINT_PTR;
+typedef unsigned int UINT_PTR, *PUINT_PTR;
 
 #ifndef LONG_PTR_DEFINED
 #define LONG_PTR_DEFINED
-	typedef _W64 long LONG_PTR, *PLONG_PTR;
-	typedef _W64 unsigned long ULONG_PTR, *PULONG_PTR;
+	typedef long LONG_PTR, *PLONG_PTR;
+	typedef unsigned long ULONG_PTR, *PULONG_PTR;
 #endif
 
 typedef unsigned short UHALF_PTR, *PUHALF_PTR;
@@ -119,14 +111,14 @@ typedef short HALF_PTR, *PHALF_PTR;
 
 #ifndef HANDLE_PTR_DEFINED
 #define HANDLE_PTR_DEFINED
-	typedef _W64 unsigned long HANDLE_PTR;
+	typedef unsigned long HANDLE_PTR;
 #endif
 
 #endif /* !_WIN64 */
 
-typedef _W64 ULONG_PTR SIZE_T, *PSIZE_T;
-typedef _W64 LONG_PTR SSIZE_T, *PSSIZE_T;
-typedef _W64 ULONG_PTR DWORD_PTR, *PDWORD_PTR;
+typedef ULONG_PTR SIZE_T, *PSIZE_T;
+typedef LONG_PTR SSIZE_T, *PSSIZE_T;
+typedef ULONG_PTR DWORD_PTR, *PDWORD_PTR;
 typedef __int64 LONG64, *PLONG64;
 typedef __int64 INT64,  *PINT64;
 typedef unsigned __int64 ULONG64, *PULONG64;