From 1c881d5b7275b571d3345aea858fe4e5662e830e Mon Sep 17 00:00:00 2001
From: Jukka Heinonen <jhei@iki.fi>
Date: Wed, 5 Dec 2001 22:09:33 +0000
Subject: [PATCH] Fixed incorrect packing.

---
 include/wine/mmsystem16.h | 8 ++++----
 include/wine/windef16.h   | 4 ++++
 include/wine/winnet16.h   | 4 ++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/include/wine/mmsystem16.h b/include/wine/mmsystem16.h
index 291fa11abb3..98a8acf1522 100644
--- a/include/wine/mmsystem16.h
+++ b/include/wine/mmsystem16.h
@@ -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;
@@ -566,4 +564,6 @@ typedef struct {
     RECT16	rc;
 } MCI_OVLY_LOAD_PARMS16, *LPMCI_OVLY_LOAD_PARMS16;
 
+#include "poppack.h"
+
 #endif  /* __WINE_WINE_MMSYSTEM16_H */
diff --git a/include/wine/windef16.h b/include/wine/windef16.h
index caa6a45ecff..7223e5fdf0d 100644
--- a/include/wine/windef16.h
+++ b/include/wine/windef16.h
@@ -85,6 +85,8 @@ typedef HANDLE16 HGDIOBJ16;
 typedef HANDLE16 HGLOBAL16;
 typedef HANDLE16 HLOCAL16;
 
+#include "pshpack1.h"
+
 /* The SIZE structure */
 
 typedef struct
@@ -111,6 +113,8 @@ typedef struct
     INT16  bottom;
 } RECT16, *LPRECT16;
 
+#include "poppack.h"
+
 /* Callback function pointers types */
 
 typedef LRESULT CALLBACK (*DRIVERPROC16)(DWORD,HDRVR16,UINT16,LPARAM,LPARAM);
diff --git a/include/wine/winnet16.h b/include/wine/winnet16.h
index 44f4f1d8911..e6b52c9d03e 100644
--- a/include/wine/winnet16.h
+++ b/include/wine/winnet16.h
@@ -11,6 +11,8 @@
 #include "windef.h"
 #include "wine/windef16.h"
 
+#include "pshpack1.h"
+
 /*
  * Remote printing
  */
@@ -45,6 +47,8 @@ typedef struct
 
 } JOBSTRUCT16, *LPJOBSTRUCT16;
 
+#include "poppack.h"
+
 #define WNPRJ_QSTATUS           0x0007
 #define WNPRJ_DEVSTATUS         0x0FF8