Skip to content

W
wine-winehq
Commit 6576986e authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

include: Fix alignment of cabinet structures on 64-bit.

parent feea8e3b
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 0 deletions
include/fci.h
View file @ 6576986e
...@@ -25,7 +25,9 @@ ...@@ -25,7 +25,9 @@
extern "C" { extern "C" {
#endif /* defined(__cplusplus) */ #endif /* defined(__cplusplus) */
#ifndef _WIN64
#include <pshpack4.h> #include <pshpack4.h>
#endif
#ifndef INCLUDED_TYPES_FCI_FDI #ifndef INCLUDED_TYPES_FCI_FDI
#define INCLUDED_TYPES_FCI_FDI 1 #define INCLUDED_TYPES_FCI_FDI 1
...@@ -250,7 +252,9 @@ BOOL __cdecl FCIDestroy(HFCI hfci); ...@@ -250,7 +252,9 @@ BOOL __cdecl FCIDestroy(HFCI hfci);
/**********************************************************************/ /**********************************************************************/
#ifndef _WIN64
#include <poppack.h> #include <poppack.h>
#endif
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */
......
include/fdi.h
View file @ 6576986e
...@@ -25,7 +25,9 @@ ...@@ -25,7 +25,9 @@
extern "C" { extern "C" {
#endif /* defined(__cplusplus) */ #endif /* defined(__cplusplus) */
#ifndef _WIN64
#include <pshpack4.h> #include <pshpack4.h>
#endif
#ifndef INCLUDED_TYPES_FCI_FDI #ifndef INCLUDED_TYPES_FCI_FDI
#define INCLUDED_TYPES_FCI_FDI 1 #define INCLUDED_TYPES_FCI_FDI 1
...@@ -259,14 +261,18 @@ typedef INT_PTR (__cdecl *PFNFDINOTIFY)(FDINOTIFICATIONTYPE fdint, ...@@ -259,14 +261,18 @@ typedef INT_PTR (__cdecl *PFNFDINOTIFY)(FDINOTIFICATIONTYPE fdint,
#define FNFDINOTIFY(fn) INT_PTR __cdecl fn(FDINOTIFICATIONTYPE fdint, \ #define FNFDINOTIFY(fn) INT_PTR __cdecl fn(FDINOTIFICATIONTYPE fdint, \
PFDINOTIFICATION pfdin) PFDINOTIFICATION pfdin)
#ifndef _WIN64
#include <pshpack1.h> #include <pshpack1.h>
#endif
typedef struct { typedef struct {
char ach[2]; /* Set to { '*', '\0' } */ char ach[2]; /* Set to { '*', '\0' } */
LONG cbFile; /* Required spill file size */ LONG cbFile; /* Required spill file size */
} FDISPILLFILE, *PFDISPILLFILE; } FDISPILLFILE, *PFDISPILLFILE;
#ifndef _WIN64
#include <poppack.h> #include <poppack.h>
#endif
#define cpuUNKNOWN (-1) /* FDI does detection */ #define cpuUNKNOWN (-1) /* FDI does detection */
#define cpu80286 (0) /* '286 opcodes only */ #define cpu80286 (0) /* '286 opcodes only */
...@@ -284,7 +290,9 @@ BOOL __cdecl FDITruncateCabinet(HFDI, char *, USHORT); ...@@ -284,7 +290,9 @@ BOOL __cdecl FDITruncateCabinet(HFDI, char *, USHORT);
/**********************************************************************/ /**********************************************************************/
#ifndef _WIN64
#include <poppack.h> #include <poppack.h>
#endif
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment