[ros-diffs] [gadamopoulos] 48358: Revert 48355

[gadamopoulos at svn.reactos.org]

Author: gadamopoulos
Date: Thu Jul 29 16:05:54 2010
New Revision: 48358

URL: http://svn.reactos.org/svn/reactos?rev=48358&view=rev
Log:
Revert 48355

Modified:
    trunk/reactos/dll/win32/browseui/shellbrowser.cpp
    trunk/reactos/include/psdk/basetsd.h

Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbrowser.cpp?rev=48358&r1=48357&r2=48358&view=diff
==============================================================================
--- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Thu Jul 29 16:05:54 2010
@@ -122,6 +122,10 @@
     "processorArchitecture='*' "\
     "publicKeyToken='6595b64144ccf1df' "\
     "language='*'\"")
+#endif // __GNUC__
+
+#ifdef __GNUC__
+#define SHANDLE_PTR LONG
 #endif // __GNUC__
 
 struct categoryCacheHeader

Modified: trunk/reactos/include/psdk/basetsd.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/basetsd.h?rev=48358&r1=48357&r2=48358&view=diff
==============================================================================
--- trunk/reactos/include/psdk/basetsd.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/basetsd.h [iso-8859-1] Thu Jul 29 16:05:54 2010
@@ -126,7 +126,6 @@
 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 short UHALF_PTR, *PUHALF_PTR;
 typedef short HALF_PTR, *PHALF_PTR;
-typedef long SHANDLE_PTR;
 
 #ifndef HANDLE_PTR_DEFINED
 #define HANDLE_PTR_DEFINED