* include/shellapi.h: Include all structs within pshpack2.h/

	poppack.h block.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 124c123..247f4d1 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-31  Danny Smith <dannysmith@users.sourceforge.net>
+
+       * include/shellapi.h: Include all structs within pshpack2.h/
+       poppack.h block.
+
 2003-07-26  Danny Smith <dannysmith@users.sourceforge.net>
 
        * include/winuser.h (ASFW_ANY, LSFW_LOCK, LSFW_UNLOCK,

diff --git a/winsup/w32api/include/shellapi.h b/winsup/w32api/include/shellapi.h
index c974674..2de4165 100644 (file)
--- a/winsup/w32api/include/shellapi.h
+++ b/winsup/w32api/include/shellapi.h
@@ -1,6 +1,6 @@
 #ifndef _SHELLAPI_H
 #define _SHELLAPI_H
-#if __GNUC__ >=3
+#if __GNUC__ >= 3
 #pragma GCC system_header
 #endif
 
@@ -96,6 +96,7 @@ extern "C" {
 
 typedef WORD FILEOP_FLAGS;
 typedef WORD PRINTEROP_FLAGS;
+#include <pshpack2.h>
 typedef struct _AppBarData {
        DWORD   cbSize;
        HWND    hWnd;
@@ -157,7 +158,6 @@ typedef struct _SHELLEXECUTEINFOW {
        HANDLE hIcon;
        HANDLE hProcess;
 } SHELLEXECUTEINFOW,*LPSHELLEXECUTEINFOW;
-#include <pshpack2.h>
 typedef struct _SHFILEOPSTRUCTA {
        HWND hwnd;
        UINT wFunc;
@@ -178,7 +178,6 @@ typedef struct _SHFILEOPSTRUCTW {
        PVOID hNameMappings;
        LPCWSTR lpszProgressTitle;
 } SHFILEOPSTRUCTW,*LPSHFILEOPSTRUCTW;
-#include <poppack.h>
 typedef struct _SHFILEINFOA {
        HICON hIcon;
        int iIcon;
@@ -198,6 +197,7 @@ typedef struct _SHQUERYRBINFO {
        __int64 i64Size;
        __int64 i64NumItems;
 } SHQUERYRBINFO, *LPSHQUERYRBINFO;
+#include <poppack.h>
 
 LPWSTR * WINAPI CommandLineToArgvW(LPCWSTR,int*);
 void WINAPI DragAcceptFiles(HWND,BOOL);