From 1e1cf481079b6230323733e03865b9ca00b4b105 Mon Sep 17 00:00:00 2001
From: Patrik Stridvall <ps@leissner.se>
Date: Sat, 17 Oct 1998 12:56:00 +0000
Subject: [PATCH] Compile fix for Solaris.

---
 include/dosexe.h   | 14 ++++++++++++--
 include/module.h   |  7 +++----
 loader/dos/dosvm.c |  2 +-
 multimedia/dplay.c |  1 -
 windows/dialog.c   |  2 +-
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/include/dosexe.h b/include/dosexe.h
index a7fb8cc2ed1..4e5e92c0069 100644
--- a/include/dosexe.h
+++ b/include/dosexe.h
@@ -4,8 +4,12 @@
  * Copyright 1998 Ove Kåven
  */
 
-#ifdef linux
+#ifndef __WINE_DOSEXE_H
+#define __WINE_DOSEXE_H
 
+#include <sys/types.h>
+#include "windows.h"
+#include "winnt.h"
 #include "wintypes.h"
 
 typedef struct _DOSTASK {
@@ -22,10 +26,14 @@ typedef struct _DOSTASK {
  pid_t task;
 } DOSTASK, *LPDOSTASK;
 
+#ifdef linux
+
 #define MZ_SUPPORTED
 
+struct _NE_MODULE;
+
 extern int MZ_InitTask( LPDOSTASK lpDosTask );
-extern int MZ_InitMemory( LPDOSTASK lpDosTask, NE_MODULE *pModule );
+extern int MZ_InitMemory( LPDOSTASK lpDosTask, struct _NE_MODULE *pModule );
 extern void MZ_KillModule( LPDOSTASK lpDosTask );
 
 #endif /* linux */
@@ -33,3 +41,5 @@ extern void MZ_KillModule( LPDOSTASK lpDosTask );
 extern HINSTANCE16 MZ_CreateProcess( LPCSTR name, LPCSTR cmdline, LPCSTR env,
                                      LPSTARTUPINFO32A startup, LPPROCESS_INFORMATION info );
 extern int DOSVM_Enter( PCONTEXT context );
+
+#endif /* __WINE_DOSEXE_H */
diff --git a/include/module.h b/include/module.h
index 55a376b5d75..ea75aba239a 100644
--- a/include/module.h
+++ b/include/module.h
@@ -7,10 +7,9 @@
 #ifndef __WINE_MODULE_H
 #define __WINE_MODULE_H
 
-#include "wintypes.h"
+#include "dosexe.h"
 #include "pe_image.h"
-
-struct _DOSTASK;
+#include "wintypes.h"
 
   /* In-memory module structure. See 'Windows Internals' p. 219 */
 typedef struct _NE_MODULE
@@ -51,7 +50,7 @@ typedef struct _NE_MODULE
     HMODULE32  module32;      /* 40 PE module handle for Win32 modules */
     HMODULE16  self;          /* 44 Handle for this module */
     WORD    self_loading_sel; /* 46 Selector used for self-loading apps. */
-    struct _DOSTASK *lpDosTask;
+    LPDOSTASK lpDosTask;
     LPVOID  dos_image;        /* pointer to DOS memory (for DOS apps) */
 } NE_MODULE;
 
diff --git a/loader/dos/dosvm.c b/loader/dos/dosvm.c
index 93d8338d248..1ce89d8baee 100644
--- a/loader/dos/dosvm.c
+++ b/loader/dos/dosvm.c
@@ -20,8 +20,8 @@
 #include "winnt.h"
 #include "msdos.h"
 #include "miscemu.h"
-#include "debug.h"
 #include "debugger.h"
+#include "debug.h"
 #include "module.h"
 #include "task.h"
 #include "ldt.h"
diff --git a/multimedia/dplay.c b/multimedia/dplay.c
index 5ae1de75750..61eccf283f1 100644
--- a/multimedia/dplay.c
+++ b/multimedia/dplay.c
@@ -15,7 +15,6 @@
 #include "dplay.h"
 
 #include "thread.h"
-#include <sys/queue.h>
 
 #define IsEqualGUID(rguid1, rguid2) (!memcmp(rguid1, rguid2, sizeof(GUID)))
 #define IsEqualIID(riid1, riid2) IsEqualGUID(riid1, riid2)
diff --git a/windows/dialog.c b/windows/dialog.c
index 4bf74b51100..fa6e8a7eeff 100644
--- a/windows/dialog.c
+++ b/windows/dialog.c
@@ -5,7 +5,7 @@
  */
 
 #include <ctype.h>
-#include <sys/errno.h>
+#include <errno.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>