diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2003-07-31 05:40:39 +0000 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2003-07-31 05:40:39 +0000 |
| commit | de03e10ca5dd21d08ec5ebc0d4fd0dca88ea2b5f (patch) | |
| tree | f7be17eef663953983911f82ca6b59713e37e889 | |
| parent | a16d51edf649e336d702ac8304f3ed64d40116a9 (diff) | |
| download | newlib-de03e10ca5dd21d08ec5ebc0d4fd0dca88ea2b5f.zip newlib-de03e10ca5dd21d08ec5ebc0d4fd0dca88ea2b5f.tar.gz newlib-de03e10ca5dd21d08ec5ebc0d4fd0dca88ea2b5f.tar.bz2 | |
* include/shellapi.h: Include all structs within pshpack2.h/
poppack.h block.
| -rw-r--r-- | winsup/w32api/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/w32api/include/shellapi.h | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 124c123..247f4d1 100644 --- 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 --- 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); |