Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-01 02:10:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[shellapi.h]

Browse source 
fix inclusion of pshpack / poppack (global and not for _WIN64)

svn path=/trunk/; revision=48055
This commit is contained in:
Timo Kreuzer 2010-07-14 23:52:48 +00:00
parent 6ae7a76cda
commit 50e511c01d
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
reactos/include/psdk/shellapi.h
View file

@ -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