Dmitry Timoshkov : comctl32: Use packing only for public ILHEAD structure, 2 bytes packing is enough.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 43bca2384021d27cf98d441e5eed8d546fdbbf45
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=43bca2384021d27cf98d441e5e...

Author: Dmitry Timoshkov <dmitry(a)codeweavers.com>
Date:   Sat Apr 21 18:16:04 2007 +0900

comctl32: Use packing only for public ILHEAD structure, 2 bytes packing is enough.

---

 dlls/comctl32/imagelist.h |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/comctl32/imagelist.h b/dlls/comctl32/imagelist.h
index a3c0b1e..cd72f38 100644
--- a/dlls/comctl32/imagelist.h
+++ b/dlls/comctl32/imagelist.h
@@ -27,8 +27,6 @@
 #include "winbase.h"
 #include "wingdi.h"
 
-#include "pshpack1.h"
-
 /* the ones with offsets at the end are the same as in Windows */
 struct _IMAGELIST
 {
@@ -60,6 +58,7 @@ struct _IMAGELIST
 #define IMAGELIST_MAGIC 0x53414D58
 
 /* Header used by ImageList_Read() and ImageList_Write() */
+#include "pshpack2.h"
 typedef struct _ILHEAD
 {
     USHORT	usMagic;
@@ -73,6 +72,6 @@ typedef struct _ILHEAD
     WORD	flags;
     SHORT	ovls[4];
 } ILHEAD;
-
 #include "poppack.h"
+
 #endif  /* __WINE_IMAGELIST_H */