Packing in 16-bit headers

[Jukka Heinonen]

Changelog:
  Fixed incorrect packing.


Index: wine/include/wine/mmsystem16.h
===================================================================
RCS file: /home/wine/wine/include/wine/mmsystem16.h,v
retrieving revision 1.3
diff -u -r1.3 mmsystem16.h
--- wine/include/wine/mmsystem16.h      2000/12/13 20:20:16     1.3
+++ wine/include/wine/mmsystem16.h      2001/12/05 16:11:21
@@ -5,13 +5,11 @@
 #ifndef __WINE_WINE_MMSYSTEM16_H
 #define __WINE_WINE_MMSYSTEM16_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "windef.h"
 #include "wine/windef16.h"
 
+#include "pshpack1.h"
+
 typedef UINT16 MMVERSION16;
 typedef UINT16 MCIDEVICEID16;
 typedef        UINT16  MMRESULT16;
@@ -565,5 +563,7 @@
     LPCSTR     lpfilename;
     RECT16     rc;
 } MCI_OVLY_LOAD_PARMS16, *LPMCI_OVLY_LOAD_PARMS16;
+
+#include "poppack.h"
 
 #endif  /* __WINE_WINE_MMSYSTEM16_H */



Index: wine/include/wine/windef16.h
===================================================================
RCS file: /home/wine/wine/include/wine/windef16.h,v
retrieving revision 1.7
diff -u -r1.7 windef16.h
--- wine/include/wine/windef16.h        2000/12/13 20:20:16     1.7
+++ wine/include/wine/windef16.h        2001/12/05 16:13:55
@@ -85,6 +85,8 @@
 typedef HANDLE16 HGLOBAL16;
 typedef HANDLE16 HLOCAL16;
 
+#include "pshpack1.h"
+
 /* The SIZE structure */
 
 typedef struct
@@ -110,6 +112,8 @@
     INT16  right;
     INT16  bottom;
 } RECT16, *LPRECT16;
+
+#include "poppack.h"
 
 /* Callback function pointers types */
 


Index: wine/include/wine/winnet16.h
===================================================================
RCS file: /home/wine/wine/include/wine/winnet16.h,v
retrieving revision 1.4
diff -u -r1.4 winnet16.h
--- wine/include/wine/winnet16.h        2000/09/26 22:20:53     1.4
+++ wine/include/wine/winnet16.h        2001/12/05 16:14:09
@@ -11,6 +11,8 @@
 #include "windef.h"
 #include "wine/windef16.h"
 
+#include "pshpack1.h"
+
 /*
  * Remote printing
  */
@@ -44,6 +46,8 @@
     WORD    pjComment;
 
 } JOBSTRUCT16, *LPJOBSTRUCT16;
+
+#include "poppack.h"
 
 #define WNPRJ_QSTATUS           0x0007
 #define WNPRJ_DEVSTATUS         0x0FF8


-- 
Jukka Heinonen <http://www.iki.fi/jhei/>