Alexandre Julliard : include: Fix alignment of cabinet structures on 64-bit .
Module: wine Branch: master Commit: 6576986e37ba0efe4f5562b334169a8203d19af7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6576986e37ba0efe4f5562b334... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 23 12:47:57 2012 +0200 include: Fix alignment of cabinet structures on 64-bit. --- include/fci.h | 4 ++++ include/fdi.h | 8 ++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/fci.h b/include/fci.h index 6e1899d..da736bd 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 f36baaf..2044c59 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" */
participants (1)
-
Alexandre Julliard