From 50e511c01d819fd7f52391131f8e1a12e0156f72 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Wed, 14 Jul 2010 23:52:48 +0000
Subject: [PATCH] [shellapi.h] fix inclusion of pshpack / poppack (global and
 not for _WIN64)

svn path=/trunk/; revision=48055
---
 reactos/include/psdk/shellapi.h | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/reactos/include/psdk/shellapi.h b/reactos/include/psdk/shellapi.h
index 888f9d9dcfe..9c7dff0f9f4 100644
--- a/reactos/include/psdk/shellapi.h
+++ b/reactos/include/psdk/shellapi.h
@@ -8,6 +8,11 @@ extern "C" {
 #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 struct _SHCREATEPROCESSINFOW
 
 typedef WORD FILEOP_FLAGS;
 typedef WORD PRINTEROP_FLAGS;
-#include <pshpack1.h>
+
 typedef struct _AppBarData {
 	DWORD	cbSize;
 	HWND	hWnd;
@@ -330,7 +335,6 @@ typedef struct _SHNAMEMAPPINGW {
 	int	cchOldPath;
 	int	cchNewPath;
 } SHNAMEMAPPINGW, *LPSHNAMEMAPPINGW;
-#include <poppack.h>
 
 #define SHERB_NOCONFIRMATION 0x1
 #define SHERB_NOPROGRESSUI   0x2
@@ -440,6 +444,11 @@ typedef LPSHNAMEMAPPINGA LPSHNAMEMAPPING;
 #define SHEmptyRecycleBin SHEmptyRecycleBinA
 #define SHGetNewLinkInfo SHGetNewLinkInfoA
 #endif
+
+#if !defined(_WIN64)
+#include <pshpack1.h>
+#endif
+
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif