From 101767d1e6e184e13241f4a6e7ef3df891f00e65 Mon Sep 17 00:00:00 2001 From: Giannis Adamopoulos Date: Thu, 29 Jul 2010 14:40:21 +0000 Subject: [PATCH] [basetsd.h] -define SHANDLE_PTR [browseui] -do not define SHANDLE_PTR locally. Using ms psdk isn't the same with compiling with msvc svn path=/trunk/; revision=48355 --- reactos/dll/win32/browseui/shellbrowser.cpp | 4 ---- reactos/include/psdk/basetsd.h | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/reactos/dll/win32/browseui/shellbrowser.cpp b/reactos/dll/win32/browseui/shellbrowser.cpp index 50e00d656cb..16d013887e7 100644 --- a/reactos/dll/win32/browseui/shellbrowser.cpp +++ b/reactos/dll/win32/browseui/shellbrowser.cpp @@ -124,10 +124,6 @@ TODO: "language='*'\"") #endif // __GNUC__ -#ifdef __GNUC__ -#define SHANDLE_PTR LONG -#endif // __GNUC__ - struct categoryCacheHeader { long dwSize; // size of header only diff --git a/reactos/include/psdk/basetsd.h b/reactos/include/psdk/basetsd.h index a39f06a787b..e53d0251d5b 100644 --- a/reactos/include/psdk/basetsd.h +++ b/reactos/include/psdk/basetsd.h @@ -126,6 +126,7 @@ 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; +typedef __int64 SHANDLE_PTR; #if !defined(__midl) && !defined(__WIDL__) static inline unsigned long HandleToUlong(const void* h ) @@ -174,6 +175,7 @@ typedef unsigned long UINT_PTR, *PUINT_PTR; typedef unsigned short UHALF_PTR, *PUHALF_PTR; typedef short HALF_PTR, *PHALF_PTR; +typedef long SHANDLE_PTR; #ifndef HANDLE_PTR_DEFINED #define HANDLE_PTR_DEFINED