[tkreuzer] 48055: [shellapi.h] fix inclusion of pshpack / poppack (global and not for _WIN64)

Author: tkreuzer
Date: Wed Jul 14 23:52:48 2010
New Revision: 48055

URL: http://svn.reactos.org/svn/reactos?rev=48055&view=rev
Log:
[shellapi.h]
fix inclusion of pshpack / poppack (global and not for _WIN64)

Modified:
    trunk/reactos/include/psdk/shellapi.h

Modified: trunk/reactos/include/psdk/shellapi.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shellapi.h?rev...
==============================================================================
--- trunk/reactos/include/psdk/shellapi.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/shellapi.h [iso-8859-1] Wed Jul 14 23:52:48 2010
@@ -8,6 +8,11 @@
 #pragma warning(push)
 #pragma warning(disable:4201)
 #endif
+
+#if !defined(_WIN64)
+#include <pshpack1.h>
+#endif
+
 #define WINSHELLAPI DECLSPEC_IMPORT
 #define ABE_LEFT	0
 #define ABE_TOP	1
@@ -160,7 +165,7 @@

typedef WORD FILEOP_FLAGS;
 typedef WORD PRINTEROP_FLAGS;
-#include <pshpack1.h>
+
 typedef struct _AppBarData {
    DWORD	cbSize;
    HWND	hWnd;
@@ -330,7 +335,6 @@
    int	cchOldPath;
    int	cchNewPath;
 } SHNAMEMAPPINGW, *LPSHNAMEMAPPINGW;
-#include <poppack.h>

#define SHERB_NOCONFIRMATION 0x1
 #define SHERB_NOPROGRESSUI   0x2
@@ -440,6 +444,11 @@
 #define SHEmptyRecycleBin SHEmptyRecycleBinA
 #define SHGetNewLinkInfo SHGetNewLinkInfoA
 #endif
+
+#if !defined(_WIN64)
+#include <pshpack1.h>
+#endif
+
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif