Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-20 12:29:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove all remaining occurrences of the W64 macro.

Browse source 
The __w64 setting is obsolete beginning with MSVC 2008.

svn path=/trunk/; revision=33475
This commit is contained in:
Colin Finck 2008-05-12 15:59:31 +00:00
parent 78681a8ec7
commit f50c85e75f
2 changed files with 15 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reactos/include/host/typedefs.h
View file

@ -14,14 +14,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <limits.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 */ /* Function attributes for GCC */
#if !defined(_MSC_VER) && !defined(__fastcall) #if !defined(_MSC_VER) && !defined(__fastcall)
#define __fastcall __attribute__((fastcall)) #define __fastcall __attribute__((fastcall))
@ -74,8 +66,8 @@ typedef int INT;
typedef unsigned int UINT, *PUINT, *LPUINT, UINT_PTR, *PUINT_PTR; typedef unsigned int UINT, *PUINT, *LPUINT, UINT_PTR, *PUINT_PTR;
typedef UCHAR BOOLEAN, *PBOOLEAN; typedef UCHAR BOOLEAN, *PBOOLEAN;
typedef int BOOL; typedef int BOOL;
typedef long int W64 LONG_PTR, *PLONG_PTR; typedef long int LONG_PTR, *PLONG_PTR;
typedef long unsigned int W64 ULONG_PTR, DWORD_PTR, *PULONG_PTR; typedef long unsigned int ULONG_PTR, DWORD_PTR, *PULONG_PTR;
typedef ULONG_PTR SIZE_T, *PSIZE_T; typedef ULONG_PTR SIZE_T, *PSIZE_T;
typedef unsigned short WCHAR, *PWCHAR, *PWSTR, *LPWSTR; typedef unsigned short WCHAR, *PWCHAR, *PWSTR, *LPWSTR;
typedef const unsigned short *PCWSTR, *LPCWSTR; typedef const unsigned short *PCWSTR, *LPCWSTR;

34
reactos/include/psdk/basetsd.h
View file

@ -4,14 +4,6 @@
#pragma GCC system_header #pragma GCC system_header
#endif #endif
#ifndef _W64
#if defined(_MSC_VER) && !defined(MIDL_PASS) && _MSC_VER >= 1300
#define _W64 __w64
#else
#define _W64
#endif
#endif
#ifdef __GNUC__ #ifdef __GNUC__
#ifndef __int64 #ifndef __int64
#define __int64 long long #define __int64 long long
@ -65,11 +57,11 @@ typedef unsigned int DWORD32, *PDWORD32;
typedef unsigned int UINT32, *PUINT32; typedef unsigned int UINT32, *PUINT32;
#if defined(_WIN64) #if defined(_WIN64)
typedef _W64 __int64 INT_PTR, *PINT_PTR; typedef __int64 INT_PTR, *PINT_PTR;
typedef _W64 unsigned __int64 UINT_PTR, *PUINT_PTR; typedef unsigned __int64 UINT_PTR, *PUINT_PTR;
typedef _W64 __int64 LONG_PTR, *PLONG_PTR; typedef __int64 LONG_PTR, *PLONG_PTR;
typedef _W64 unsigned __int64 ULONG_PTR, *PULONG_PTR; typedef unsigned __int64 ULONG_PTR, *PULONG_PTR;
typedef _W64 unsigned __int64 HANDLE_PTR; typedef unsigned __int64 HANDLE_PTR;
typedef unsigned int UHALF_PTR, *PUHALF_PTR; typedef unsigned int UHALF_PTR, *PUHALF_PTR;
typedef int HALF_PTR, *PHALF_PTR; typedef int HALF_PTR, *PHALF_PTR;
@ -105,13 +97,13 @@ inline void* ULongToPtr( const unsigned long ul )
#endif /* 0_ */ #endif /* 0_ */
#else /* !_WIN64 */ #else /* !_WIN64 */
typedef _W64 int INT_PTR, *PINT_PTR; typedef int INT_PTR, *PINT_PTR;
typedef _W64 unsigned int UINT_PTR, *PUINT_PTR; typedef unsigned int UINT_PTR, *PUINT_PTR;
#ifndef LONG_PTR_DEFINED #ifndef LONG_PTR_DEFINED
#define LONG_PTR_DEFINED #define LONG_PTR_DEFINED
typedef _W64 long LONG_PTR, *PLONG_PTR; typedef long LONG_PTR, *PLONG_PTR;
typedef _W64 unsigned long ULONG_PTR, *PULONG_PTR; typedef unsigned long ULONG_PTR, *PULONG_PTR;
#endif #endif
typedef unsigned short UHALF_PTR, *PUHALF_PTR; typedef unsigned short UHALF_PTR, *PUHALF_PTR;
@ -119,14 +111,14 @@ typedef short HALF_PTR, *PHALF_PTR;
#ifndef HANDLE_PTR_DEFINED #ifndef HANDLE_PTR_DEFINED
#define HANDLE_PTR_DEFINED #define HANDLE_PTR_DEFINED
typedef _W64 unsigned long HANDLE_PTR; typedef unsigned long HANDLE_PTR;
#endif #endif
#endif /* !_WIN64 */ #endif /* !_WIN64 */
typedef _W64 ULONG_PTR SIZE_T, *PSIZE_T; typedef ULONG_PTR SIZE_T, *PSIZE_T;
typedef _W64 LONG_PTR SSIZE_T, *PSSIZE_T; typedef LONG_PTR SSIZE_T, *PSSIZE_T;
typedef _W64 ULONG_PTR DWORD_PTR, *PDWORD_PTR; typedef ULONG_PTR DWORD_PTR, *PDWORD_PTR;
typedef __int64 LONG64, *PLONG64; typedef __int64 LONG64, *PLONG64;
typedef __int64 INT64, *PINT64; typedef __int64 INT64, *PINT64;
typedef unsigned __int64 ULONG64, *PULONG64; typedef unsigned __int64 ULONG64, *PULONG64;