From 6576986e37ba0efe4f5562b334169a8203d19af7 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Mon, 23 Jul 2012 12:47:57 +0200
Subject: [PATCH] include: Fix alignment of cabinet structures on 64-bit.

---
 include/fci.h | 4 ++++
 include/fdi.h | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/include/fci.h b/include/fci.h
index 6e1899d51d..da736bddf6 100644
--- a/include/fci.h
+++ b/include/fci.h
@@ -25,7 +25,9 @@
 extern "C" {
 #endif /* defined(__cplusplus) */
 
+#ifndef _WIN64
 #include <pshpack4.h>
+#endif
 
 #ifndef INCLUDED_TYPES_FCI_FDI
 #define INCLUDED_TYPES_FCI_FDI 1
@@ -250,7 +252,9 @@ BOOL __cdecl FCIDestroy(HFCI hfci);
 
 /**********************************************************************/
 
+#ifndef _WIN64
 #include <poppack.h>
+#endif
 
 #ifdef __cplusplus
 } /* extern "C" */
diff --git a/include/fdi.h b/include/fdi.h
index f36baaf40d..2044c59bea 100644
--- a/include/fdi.h
+++ b/include/fdi.h
@@ -25,7 +25,9 @@
 extern "C" {
 #endif /* defined(__cplusplus) */
 
+#ifndef _WIN64
 #include <pshpack4.h>
+#endif
 
 #ifndef INCLUDED_TYPES_FCI_FDI
 #define INCLUDED_TYPES_FCI_FDI 1
@@ -259,14 +261,18 @@ typedef INT_PTR (__cdecl *PFNFDINOTIFY)(FDINOTIFICATIONTYPE fdint,
 #define FNFDINOTIFY(fn) INT_PTR __cdecl fn(FDINOTIFICATIONTYPE fdint, \
 					   PFDINOTIFICATION pfdin)
 
+#ifndef _WIN64
 #include <pshpack1.h>
+#endif
 
 typedef struct {
     char ach[2];  /* Set to { '*', '\0' } */
     LONG cbFile;  /* Required spill file size */
 } FDISPILLFILE, *PFDISPILLFILE;
 
+#ifndef _WIN64
 #include <poppack.h>
+#endif
 
 #define cpuUNKNOWN (-1)  /* FDI does detection */
 #define cpu80286   (0)   /* '286 opcodes only */
@@ -284,7 +290,9 @@ BOOL __cdecl FDITruncateCabinet(HFDI, char *, USHORT);
 
 /**********************************************************************/
 
+#ifndef _WIN64
 #include <poppack.h>
+#endif
 
 #ifdef __cplusplus
 } /* extern "C" */
-- 
2.32.0.93.g670b81a890