From f19e851716bd99f8f690871d3322264fc5f72163 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Mon, 7 Jun 2010 21:15:05 +0000 Subject: [PATCH] [PSDK] - Fix a "FIXME! HACK!!!" svn path=/branches/header-work/; revision=47681 --- include/psdk/basetsd.h | 26 ++++++++++++++++++++++++++ include/psdk/ntdef.h | 2 -- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/include/psdk/basetsd.h b/include/psdk/basetsd.h index e2e5b93f453..382418678a7 100644 --- a/include/psdk/basetsd.h +++ b/include/psdk/basetsd.h @@ -15,6 +15,32 @@ #endif #endif +#if defined(_MSC_VER) && (_MSC_VER < 1300) +#error Old MSVC compiler version. +#endif + +#ifdef _MAC +#error Not supported. +#endif + +#if !defined(MIDL_PASS) && !defined(RC_INVOKED) + #define POINTER_64 __ptr64 + #if defined(_WIN64) + #define POINTER_32 __ptr32 + #else + #define POINTER_32 + #endif +#else + #define POINTER_64 + #define POINTER_32 +#endif /* !defined(MIDL_PASS) && !defined(RC_INVOKED) */ + +#if defined(_M_MRX000) || defined(_M_AMD64) || defined(_M_IA64) + typedef unsigned __int64 POINTER_64_INT; +#else + typedef unsigned long POINTER_64_INT; +#endif + #if defined(_WIN64) #define __int3264 __int64 #define ADDRESS_TAG_BIT 0x40000000000UI64 diff --git a/include/psdk/ntdef.h b/include/psdk/ntdef.h index 18107cdcbcc..4d6ed252d5f 100644 --- a/include/psdk/ntdef.h +++ b/include/psdk/ntdef.h @@ -20,8 +20,6 @@ #endif #endif -typedef unsigned long POINTER_64; // FIXME! HACK!!! - /* Pseudo Modifiers for Input Parameters */ #ifndef IN -- 2.17.1