check and conditionally include sys/types.h, sys/time.h, and unistd.h.

watcom/unistd.h and win32/unistd.h are no longer necessary, especially
after previous commit.

Makefile.dos

@@ -19,7 +19,7 @@ CFLAGS += -wcd=303
 # -5s  :  Pentium stack calling conventions.
 # -5r  :  Pentium register calling conventions.
 CFLAGS += -5s
-INCLUDES = -I"src/watcom" -I"$(%WATCOM)/h"
+INCLUDES = -I"$(%WATCOM)/h"
 
 # for sound_sb:
 CPPFLAGS+= -DSOUND_SB

Makefile.os2

@@ -23,7 +23,7 @@ CFLAGS += -wcd=303
 # -5s  :  Pentium stack calling conventions.
 # -5r  :  Pentium register calling conventions.
 CFLAGS += -5s
-INCLUDES = -I"src/watcom" -I"$(%WATCOM)/h/os2" -I"$(%WATCOM)/h"
+INCLUDES = -I"$(%WATCOM)/h/os2" -I"$(%WATCOM)/h"
 
 # for sound_dart:
 CPPFLAGS = -DSOUND_OS2DART

Makefile.w32

@@ -23,7 +23,7 @@ CFLAGS += -wcd=303
 # -5s  :  Pentium stack calling conventions.
 # -5r  :  Pentium register calling conventions.
 CFLAGS += -5s
-INCLUDES = -I"src/win32" -I"$(%WATCOM)/h/nt" -I"$(%WATCOM)/h"
+INCLUDES = -I"$(%WATCOM)/h/nt" -I"$(%WATCOM)/h"
 
 # for sound_win32:
 CPPFLAGS = -DSOUND_WIN32

configure.ac

@@ -99,7 +99,7 @@ AC_DEFUN([AC_CHECK_DEFINED],[
   AS_VAR_POPDEF([ac_var])dnl
 ])
 
-AC_CHECK_HEADERS([getopt.h signal.h sys/select.h sys/time.h sys/audioio.h])
+AC_CHECK_HEADERS([sys/types.h unistd.h getopt.h signal.h sys/select.h sys/time.h sys/audioio.h])
 case $host_os in
 dnl don't check half-baked termios for amiga or dos targets.
   amigaos*|aros*|morphos*|*djgpp) ;;

src/Makefile.am

@@ -100,5 +100,4 @@ pkgsysconfdir   = ${sysconfdir}/${PACKAGE_NAME}
 pkgsysconf_DATA = modules.conf xmp.conf
 
 EXTRA_DIST = ${man_MANS} ${pkgsysconf_DATA} \
-	dos/dosdma.h dos/dosirq.h dos/dossb.h dos/dosutil.h \
+	dos/dosdma.h dos/dosirq.h dos/dossb.h dos/dosutil.h
-	win32/unistd.h watcom/unistd.h

src/delay.c

@@ -13,7 +13,7 @@ void delay_ms(int msec) {
 	Sleep(msec);
 }
 
-#elif defined(__OS2__)
+#elif defined(__OS2__)||defined(__EMX__)
 #define INCL_DOSPROCESS
 #include <os2.h>
 
@@ -40,10 +40,16 @@ void delay_ms(int msec) {
 #ifdef HAVE_SYS_SELECT_H
 #  include <sys/select.h>
 #else
+#  ifdef HAVE_SYS_TIME_H
 #  include <sys/time.h>
+#  endif
+#  ifdef HAVE_SYS_TYPES_H
 #  include <sys/types.h>
+#  endif
+#  ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 #  endif
+#endif
 #include <stddef.h>
 
 void delay_ms(int msec) {

src/main.c

@@ -18,8 +18,12 @@
 #if defined(__WATCOMC__)
 #include <time.h>
 #endif
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <stdarg.h>
 #if defined(HAVE_GETOPT_H) && defined(HAVE_GETOPT_LONG)
 #include <getopt.h>

src/watcom/unistd.h

@@ -1,6 +0,0 @@
-#ifndef XMP_WATCOM_UNISTD_H
-#define XMP_WATCOM_UNISTD_H
-
-#include <io.h>  /* do not want Watcom unistd.h */
-
-#endif

src/win32/unistd.h

@@ -1,6 +0,0 @@
-#ifndef _XMP_WIN32_UNISTD_H
-#define _XMP_WIN32_UNISTD_H
-
-#include <io.h>
-
-#endif

vc/xmp.vcproj

@@ -38,7 +38,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\src;..\src\win32"
+				AdditionalIncludeDirectories="..\src"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;SOUND_WIN32"
 				ExceptionHandling="0"
 				RuntimeLibrary="2"