winedos: Merge the few definitions from dosvm.h into dosexe.h.

dlls/winedos/dosexe.h

@@ -22,6 +22,7 @@
 #define __WINE_DOSEXE_H
 
 #include <stdarg.h>
+#include <sys/types.h>
 
 #include "windef.h"
 #include "wine/library.h"
@@ -34,6 +35,13 @@
 
 struct _DOSEVENT;
 
+typedef struct {
+  PAPCFUNC proc;
+  ULONG_PTR arg;
+} DOS_SPC;
+
+extern pid_t dosvm_pid;
+
 /* amount of space reserved for relay stack */
 #define DOSVM_RELAY_DATA_SIZE 4096
 

dlls/winedos/dosvm.c

@@ -51,7 +51,6 @@
 #include "wincon.h"
 
 #include "dosexe.h"
-#include "dosvm.h"
 #include "wine/debug.h"
 #include "excpt.h"
 

dlls/winedos/dosvm.h

-/*
- * DOS virtual machine
- *
- * Copyright 2000 Ove Kåven
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef __WINE_DOSVM_H
-#define __WINE_DOSVM_H
-
-#include <sys/types.h> /* pid_t */
-
-typedef struct {
-  PAPCFUNC proc;
-  ULONG_PTR arg;
-} DOS_SPC;
-
-extern pid_t dosvm_pid;
-
-#endif /* __WINE_DOSVM_H */

dlls/winedos/module.c

@@ -47,7 +47,6 @@
 #include "winerror.h"
 #include "wine/debug.h"
 #include "dosexe.h"
-#include "dosvm.h"
 #include "vga.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(module);