[cfinck] 33475: Remove all remaining occurrences of the W64 macro. The __w64 setting is obsolete beginning with MSVC 2008.

Author: cfinck
Date: Mon May 12 10:59:31 2008
New Revision: 33475

URL: http://svn.reactos.org/svn/reactos?rev=33475&view=rev
Log:
Remove all remaining occurrences of the W64 macro.
The __w64 setting is obsolete beginning with MSVC 2008.

Modified:
    trunk/reactos/include/host/typedefs.h
    trunk/reactos/include/psdk/basetsd.h

Modified: trunk/reactos/include/host/typedefs.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/typedefs.h?rev...
==============================================================================
--- trunk/reactos/include/host/typedefs.h [iso-8859-1] (original)
+++ trunk/reactos/include/host/typedefs.h [iso-8859-1] Mon May 12 10:59:31 2008
@@ -13,14 +13,6 @@
 #include <assert.h>
 #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)
@@ -74,8 +66,8 @@
 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;

Modified: trunk/reactos/include/psdk/basetsd.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/basetsd.h?rev=...
==============================================================================
--- trunk/reactos/include/psdk/basetsd.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/basetsd.h [iso-8859-1] Mon May 12 10:59:31 2008
@@ -2,14 +2,6 @@
 #define _BASETSD_H
 #if __GNUC__ >=3
 #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__
@@ -65,11 +57,11 @@
 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 @@
 #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 @@

#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;