- Added missing configuration #if:s and #includes:s.

configure.in

@@ -532,37 +532,51 @@ AC_CHECK_FUNCS(\
 dnl **** Check for header files ****
 
 AC_CHECK_HEADERS(\
+	a.out.h \
+	a_out.h \
+	arpa/inet.h \
 	arpa/nameser.h \
 	curses.h \
 	elf.h \
 	float.h \
 	libio.h \
+	link.h \
 	linux/cdrom.h \
 	linux/joystick.h \
 	linux/ucdrom.h \
 	ncurses.h \
 	net/if.h \
 	netinet/in.h \
+	netinet/tcp.h \
 	resolv.h \
+	sched.h \
+	socket.h \
 	strings.h \
 	sys/cdio.h \
 	sys/errno.h \
 	sys/file.h \
 	sys/filio.h \
+	sys/ipc.h \
 	sys/lwp.h \
 	sys/mman.h \
 	sys/modem.h \
 	sys/mount.h \
+	sys/msg.h \
 	sys/param.h \
 	sys/signal.h \
+	sys/shm.h \
+	sys/socket.h \
 	sys/sockio.h \
 	sys/statfs.h \
 	sys/strtio.h \
 	sys/syscall.h \
+	sys/wait.h \
+	sys/v86.h \
+	sys/v86intr.h \
 	sys/vfs.h \
+	sys/vm86.h \
 	syscall.h \
 	ucontext.h \
-	unistd.h \
 	wctype.h \
 )
 AC_HEADER_STAT()

debugger/stabs.c

@@ -34,14 +34,20 @@
 #ifdef HAVE_ELF_H
 # include <elf.h>
 #endif
-#include <link.h>
+#ifdef HAVE_LINK_H
+# include <link.h>
+#endif
 #ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
+# include <sys/mman.h>
 #endif
 #elif defined(__EMX__)
-#include <a_out.h>
+#ifdef HAVE_A_OUT_H
+# include <a_out.h>
+#endif
 #else
-#include <a.out.h>
+#ifdef HAVE_A_OUT_H
+# include <a.out.h>
+#endif
 #endif
 
 #ifndef N_UNDF

dlls/crtdll/crtdll_main.c

@@ -26,6 +26,8 @@ AJ 990101:
  * since we need 2 byte wide characters. - Marcus Meissner, 981031
  */
 
+#include "config.h"
+
 #include <errno.h>
 #include <stdlib.h>
 #include <stdarg.h>

dlls/ole32/compobj.c

@@ -8,9 +8,8 @@
  */
 
 #include "config.h"
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+
+#include <unistd.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/time.h>
@@ -19,7 +18,9 @@
 # include <sys/file.h>
 #endif
 #include <sys/ioctl.h>
-#include <sys/socket.h>
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
 #ifdef HAVE_SYS_SOCKIO_H
 # include <sys/sockio.h>
 #endif

dlls/oleaut32/variant.c

@@ -20,6 +20,8 @@
  *   - The parsing does not accept has many formats has the Windows implementation.
  */
 
+#include "config.h"
+ 
 #include "windef.h"
 #include "oleauto.h"
 #include "heap.h"

dlls/winaspi/winaspi16.c

+#include "config.h"
+
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>

dlls/wnaspi32/winaspi32.c

+#include "config.h"
+
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>

files/directory.c

@@ -4,6 +4,8 @@
  * Copyright 1995 Alexandre Julliard
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>

files/dos_fs.c

@@ -1599,7 +1599,7 @@ void DOSFS_UnixTimeToFileTime( time_t unix_time, FILETIME *filetime,
        Claus Fischer, fischer@iue.tuwien.ac.at
        */
 
-#if (SIZEOF_LONG_LONG >= 8)
+#if SIZEOF_LONG_LONG >= 8
 #  define USE_LONG_LONG 1
 #else
 #  define USE_LONG_LONG 0

graphics/ddraw.c

@@ -22,10 +22,14 @@
 #include "ts_xutil.h"
 
 #ifdef HAVE_LIBXXSHM
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include "ts_xshm.h"
+# include <sys/types.h>
+# ifdef HAVE_SYS_IPC_H
+#  include <sys/ipc.h>
+# endif
+# ifdef HAVE_SYS_SHM_H
+#  include <sys/shm.h>
+# endif
+# include "ts_xshm.h"
 #endif /* defined(HAVE_LIBXXSHM) */
 
 #ifdef HAVE_LIBXXF86DGA
@@ -40,7 +44,9 @@
 
 #include <unistd.h>
 #include <assert.h>
-#include <sys/signal.h>
+#ifdef HAVE_SYS_SIGNAL_H
+# include <sys/signal.h>
+#endif
 #include <fcntl.h>
 #include <string.h>
 #include <stdlib.h>

graphics/x11drv/dib.c

@@ -11,6 +11,16 @@
 #include "ts_xlib.h"
 #include "ts_xutil.h"
 
+#ifdef HAVE_LIBXXSHM
+# include "ts_xshm.h"
+# ifdef HAVE_SYS_SHM_H
+#  include <sys/shm.h>
+# endif
+# ifdef HAVE_SYS_IPC_H
+#  include <sys/ipc.h>
+# endif
+#endif /* defined(HAVE_LIBXXSHM) */
+
 #include "windef.h"
 #include "bitmap.h"
 #include "x11drv.h"
@@ -22,10 +32,6 @@
 #include "global.h"
 #include "xmalloc.h" /* for XCREATEIMAGE macro */
 
-#include "ts_xshm.h"
-#include <sys/shm.h>
-#include <sys/ipc.h>
-
 DECLARE_DEBUG_CHANNEL(bitmap)
 DECLARE_DEBUG_CHANNEL(x11drv)
 

include/config.h.in

@@ -217,6 +217,15 @@
 /* Define if you have the <X11/xpm.h> header file.  */
 #undef HAVE_X11_XPM_H
 
+/* Define if you have the <a.out.h> header file.  */
+#undef HAVE_A_OUT_H
+
+/* Define if you have the <a_out.h> header file.  */
+#undef HAVE_A_OUT_H
+
+/* Define if you have the <arpa/inet.h> header file.  */
+#undef HAVE_ARPA_INET_H
+
 /* Define if you have the <arpa/nameser.h> header file.  */
 #undef HAVE_ARPA_NAMESER_H
 
@@ -235,6 +244,9 @@
 /* Define if you have the <libio.h> header file.  */
 #undef HAVE_LIBIO_H
 
+/* Define if you have the <link.h> header file.  */
+#undef HAVE_LINK_H
+
 /* Define if you have the <linux/cdrom.h> header file.  */
 #undef HAVE_LINUX_CDROM_H
 
@@ -256,9 +268,18 @@
 /* Define if you have the <netinet/in.h> header file.  */
 #undef HAVE_NETINET_IN_H
 
+/* Define if you have the <netinet/tcp.h> header file.  */
+#undef HAVE_NETINET_TCP_H
+
 /* Define if you have the <resolv.h> header file.  */
 #undef HAVE_RESOLV_H
 
+/* Define if you have the <sched.h> header file.  */
+#undef HAVE_SCHED_H
+
+/* Define if you have the <socket.h> header file.  */
+#undef HAVE_SOCKET_H
+
 /* Define if you have the <soundcard.h> header file.  */
 #undef HAVE_SOUNDCARD_H
 
@@ -277,6 +298,9 @@
 /* Define if you have the <sys/filio.h> header file.  */
 #undef HAVE_SYS_FILIO_H
 
+/* Define if you have the <sys/ipc.h> header file.  */
+#undef HAVE_SYS_IPC_H
+
 /* Define if you have the <sys/lwp.h> header file.  */
 #undef HAVE_SYS_LWP_H
 
@@ -289,12 +313,21 @@
 /* Define if you have the <sys/mount.h> header file.  */
 #undef HAVE_SYS_MOUNT_H
 
+/* Define if you have the <sys/msg.h> header file.  */
+#undef HAVE_SYS_MSG_H
+
 /* Define if you have the <sys/param.h> header file.  */
 #undef HAVE_SYS_PARAM_H
 
+/* Define if you have the <sys/shm.h> header file.  */
+#undef HAVE_SYS_SHM_H
+
 /* Define if you have the <sys/signal.h> header file.  */
 #undef HAVE_SYS_SIGNAL_H
 
+/* Define if you have the <sys/socket.h> header file.  */
+#undef HAVE_SYS_SOCKET_H
+
 /* Define if you have the <sys/sockio.h> header file.  */
 #undef HAVE_SYS_SOCKIO_H
 
@@ -310,18 +343,27 @@
 /* Define if you have the <sys/syscall.h> header file.  */
 #undef HAVE_SYS_SYSCALL_H
 
+/* Define if you have the <sys/v86.h> header file.  */
+#undef HAVE_SYS_V86_H
+
+/* Define if you have the <sys/v86intr.h> header file.  */
+#undef HAVE_SYS_V86INTR_H
+
 /* Define if you have the <sys/vfs.h> header file.  */
 #undef HAVE_SYS_VFS_H
 
+/* Define if you have the <sys/vm86.h> header file.  */
+#undef HAVE_SYS_VM86_H
+
+/* Define if you have the <sys/wait.h> header file.  */
+#undef HAVE_SYS_WAIT_H
+
 /* Define if you have the <syscall.h> header file.  */
 #undef HAVE_SYSCALL_H
 
 /* Define if you have the <ucontext.h> header file.  */
 #undef HAVE_UCONTEXT_H
 
-/* Define if you have the <unistd.h> header file.  */
-#undef HAVE_UNISTD_H
-
 /* Define if you have the <wctype.h> header file.  */
 #undef HAVE_WCTYPE_H
 

loader/dos/dosmod.c

@@ -6,6 +6,8 @@
 
 #if defined(linux) && defined(__i386__)
 
+#include "config.h"
+
 /* apparently ELF images are usually loaded high anyway */
 #ifndef __ELF__
 /* if not, force dosmod at high addresses */
@@ -20,12 +22,18 @@ asm(".org 0x110000");
 #include <fcntl.h>
 #include <signal.h>
 #include <sys/stat.h>
-#include <sys/mman.h>
-#include <sys/vm86.h>
+#ifdef HAVE_SYS_MMAN_H
+# include <sys/mman.h>
+#endif
+#ifdef HAVE_SYS_VM86_H
+# include <sys/vm86.h>
+#endif
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/ptrace.h>
-#include <sys/wait.h>
+#ifdef HAVE_SYS_WAIT_H
+# include <sys/wait.h>
+#endif
 #include "dosmod.h"
 
  /* FIXME: hack because libc vm86 may be the old syscall version */

loader/dos/dosvm.c

@@ -6,6 +6,8 @@
  * This code hasn't been completely cleaned up yet.
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -34,8 +36,12 @@ DECLARE_DEBUG_CHANNEL(relay)
 
 #ifdef MZ_SUPPORTED
 
-#include <sys/vm86.h>
-#include <sys/mman.h>
+#ifdef HAVE_SYS_VM86_H
+# include <sys/vm86.h>
+#endif
+#ifdef HAVE_SYS_MMAN_H
+# include <sys/mman.h>
+#endif
 
 #define IF_CLR(ctx) EFL_reg(ctx) &= ~VIF_MASK
 #define IF_ENABLED(ctx) (EFL_reg(ctx) & VIF_MASK)

loader/dos/module.c

@@ -6,6 +6,8 @@
  * This code hasn't been completely cleaned up yet.
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -38,7 +40,9 @@ DEFAULT_DEBUG_CHANNEL(module)
 
 #ifdef MZ_SUPPORTED
 
-#include <sys/mman.h>
+#ifdef HAVE_SYS_MMAN_H
+# include <sys/mman.h>
+#endif
 
 /* define this to try mapping through /proc/pid/mem instead of a temp file,
    but Linus doesn't like mmapping /proc/pid/mem, so it doesn't work for me */

loader/pe_image.c

@@ -33,6 +33,8 @@
  *   difficult to support... (See mm/filemap.c).
  */
 
+#include "config.h"
+
 #include <errno.h>
 #include <assert.h>
 #include <stdlib.h>

memory/ldt.c

@@ -5,6 +5,8 @@
  * Copyright 1995 Alexandre Julliard
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
@@ -16,7 +18,10 @@ DEFAULT_DEBUG_CHANNEL(ldt)
 #ifdef __i386__
 
 #ifdef linux
-#include <sys/syscall.h>
+
+#ifdef HAVE_SYS_SYSCALL_H
+# include <sys/syscall.h>
+#endif
 
 struct modify_ldt_s 
 {

msdos/int21.c

@@ -2,6 +2,8 @@
  * DOS interrupt 21h handler
  */
 
+#include "config.h"
+
 #include <time.h>
 #include <fcntl.h>
 #include <errno.h>

objects/gdiobj.c

@@ -1027,7 +1027,7 @@ INT WINAPI MulDiv(
 	     INT nMultiplier,
 	     INT nDivisor
 ) {
-#if (SIZEOF_LONG_LONG >= 8)
+#if SIZEOF_LONG_LONG >= 8
     long long ret;
 
     if (!nDivisor) return -1;

relay32/snoop.c

@@ -4,6 +4,7 @@
  * Copyright 1998 Marcus Meissner
  */
 
+#include "config.h"
 
 #include <assert.h>
 #include <string.h>

scheduler/client.c

@@ -12,7 +12,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
-#include <sys/socket.h>
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
 #ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>
 #endif

scheduler/thread.c

@@ -9,7 +9,9 @@
 #include <assert.h>
 #include <fcntl.h>
 #include <sys/types.h>
-#include <sys/socket.h>
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
 #ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>
 #endif

server/console.c

@@ -7,6 +7,8 @@
  *        the client-side console support.
  */
 
+#include "config.h"
+
 #include <assert.h>
 #include <fcntl.h>
 #include <signal.h>

server/file.c

@@ -4,6 +4,8 @@
  * Copyright (C) 1998 Alexandre Julliard
  */
 
+#include "config.h"
+
 #include <assert.h>
 #include <fcntl.h>
 #include <stdio.h>

server/pipe.c

@@ -4,6 +4,8 @@
  * Copyright (C) 1998 Alexandre Julliard
  */
 
+#include "config.h"
+
 #include <assert.h>
 #include <fcntl.h>
 #include <string.h>

server/sock.c

@@ -7,18 +7,27 @@
  * on the access of the current handle?
  */
 
+#include "config.h"
+
 #include <assert.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <sys/errno.h>
+#ifdef HAVE_SYS_ERRNO_H
+# include <sys/errno.h>
+#endif
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <sys/socket.h>
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
 #include <sys/ioctl.h>
+#ifdef HAVE_SYS_FILIO_H
+# include <sys/filio.h>
+#endif
 #include <time.h>
 #include <unistd.h>
 

server/socket.c

@@ -4,6 +4,8 @@
  * Copyright (C) 1998 Alexandre Julliard
  */
 
+#include "config.h"
+
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -13,7 +15,9 @@
 #include <string.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <sys/socket.h>
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
 #include <sys/uio.h>
 #include <unistd.h>
 

tools/build.c

@@ -6,6 +6,8 @@
  * Copyright 1999 Ulrich Weigand
  */
 
+#include "config.h"
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>

tools/fnt2bdf.c

@@ -7,7 +7,11 @@
  *
  */
 
-#include <sys/param.h>
+#include "config.h"
+
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdlib.h>

win32/console.c

@@ -19,6 +19,8 @@
  * -  LYNX/W32. Works mostly, some keys crash it.
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <termios.h>

win32/device.c

@@ -7,6 +7,8 @@
  *
  */
 
+#include "config.h"
+
 #include <errno.h>
 #include <assert.h>
 #include <stdlib.h>

win32/file.c

@@ -4,6 +4,8 @@
  * Copyright 1995 Martin von Loewis, Sven Verdoolaege, and Cameron Heide
  */
 
+#include "config.h"
+
 #include <errno.h>
 #ifdef HAVE_SYS_ERRNO_H
 #include <sys/errno.h>

win32/process.c

@@ -38,7 +38,7 @@ void Process_ClockTimeToFileTime( clock_t unix_time, LPFILETIME filetime )
 {
     double td = (unix_time*10000000.0)/CLK_TCK;
     /* Yes, double, because long int might overflow here. */
-#if (SIZEOF_LONG_LONG >= 8)
+#if SIZEOF_LONG_LONG >= 8
     unsigned long long t = td;
     filetime->dwLowDateTime  = (UINT) t;
     filetime->dwHighDateTime = (UINT) (t >> 32);

windows/dinput.c

@@ -30,7 +30,9 @@
 #include <sys/fcntl.h>
 #include <sys/ioctl.h>
 #include <errno.h>
-#include <sys/errno.h>
+#ifdef HAVE_SYS_ERRNO_H
+# include <sys/errno.h>
+#endif
 #ifdef HAVE_LINUX_JOYSTICK_H
 # include <linux/joystick.h>
 # define JOYDEV	"/dev/js0"