Revert 48355

svn path=/trunk/; revision=48358

diff --git a/reactos/dll/win32/browseui/shellbrowser.cpp b/reactos/dll/win32/browseui/shellbrowser.cpp
index 16d0138..50e00d6 100644 (file)
--- a/reactos/dll/win32/browseui/shellbrowser.cpp
+++ b/reactos/dll/win32/browseui/shellbrowser.cpp
@@ -124,6 +124,10 @@ 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 e53d025..a39f06a 100644 (file)
--- a/reactos/include/psdk/basetsd.h
+++ b/reactos/include/psdk/basetsd.h
@@ -126,7 +126,6 @@ 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 )
@@ -175,7 +174,6 @@ 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