2002-12-02 Andrew Stadt <acstadt@sympatico.ca>

	* include/shellapi.h (_SHFILEOPSTRUCTA,_SHFILEOPSTRUCTW):
	Wrap with pshpack2.h/poppack.h to correct alignment.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index a4fe734..a2d46b7 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-02  Andrew Stadt  <acstadt@sympatico.ca>
+
+       * include/shellapi.h (_SHFILEOPSTRUCTA,_SHFILEOPSTRUCTW):
+       Wrap with pshpack2.h/poppack.h to correct alignment.
+
 2002-12-02  Ken Fitlike  <kenfitlike@users.sourceforge.net>
 
        * include/commctrl.h (LVBKIF_*): Add defines.

diff --git a/winsup/w32api/include/shellapi.h b/winsup/w32api/include/shellapi.h
index b663102..5e29fb3 100644 (file)
--- a/winsup/w32api/include/shellapi.h
+++ b/winsup/w32api/include/shellapi.h
@@ -154,6 +154,7 @@ typedef struct _SHELLEXECUTEINFOW {
        HANDLE hIcon;
        HANDLE hProcess;
 } SHELLEXECUTEINFOW,*LPSHELLEXECUTEINFOW;
+#include <pshpack2.h>
 typedef struct _SHFILEOPSTRUCTA {
        HWND hwnd;
        UINT wFunc;
@@ -174,6 +175,7 @@ typedef struct _SHFILEOPSTRUCTW {
        PVOID hNameMappings;
        LPCWSTR lpszProgressTitle;
 } SHFILEOPSTRUCTW,*LPSHFILEOPSTRUCTW;
+#include <poppack.h>
 typedef struct _SHFILEINFOA {
        HICON hIcon;
        int iIcon;