From 96336324cfe6a685aec983b15febec69ac42e9dd Mon Sep 17 00:00:00 2001 From: Patrik Stridvall Date: Sun, 24 Oct 1999 22:13:47 +0000 Subject: [PATCH] - Added missing configuration #if:s and #includes:s. - Minor configuration related changes. --- configure | 114 +++++++++++++++++++++----------------- configure.in | 16 +++++- debugger/stabs.c | 14 +++-- dlls/crtdll/crtdll_main.c | 2 + dlls/ole32/compobj.c | 9 +-- dlls/oleaut32/variant.c | 2 + dlls/winaspi/winaspi16.c | 2 + dlls/wnaspi32/winaspi32.c | 2 + files/directory.c | 2 + files/dos_fs.c | 2 +- graphics/ddraw.c | 16 ++++-- graphics/x11drv/dib.c | 14 +++-- include/config.h.in | 48 +++++++++++++++- loader/dos/dosmod.c | 14 ++++- loader/dos/dosvm.c | 10 +++- loader/dos/module.c | 6 +- loader/pe_image.c | 2 + memory/ldt.c | 7 ++- msdos/int21.c | 2 + objects/gdiobj.c | 2 +- relay32/snoop.c | 1 + scheduler/client.c | 4 +- scheduler/thread.c | 4 +- server/console.c | 2 + server/file.c | 2 + server/pipe.c | 2 + server/sock.c | 13 ++++- server/socket.c | 6 +- tools/build.c | 2 + tools/fnt2bdf.c | 6 +- win32/console.c | 2 + win32/device.c | 2 + win32/file.c | 2 + win32/process.c | 2 +- windows/dinput.c | 4 +- 35 files changed, 252 insertions(+), 88 deletions(-) diff --git a/configure b/configure index f5abb467600..f083a6281bb 100755 --- a/configure +++ b/configure @@ -4627,53 +4627,67 @@ done for ac_hdr in \ + 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 \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4667: checking for $ac_hdr" >&5 +echo "configure:4681: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4677: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4691: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4700,12 +4714,12 @@ fi done echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 -echo "configure:4704: checking whether stat file-mode macros are broken" >&5 +echo "configure:4718: checking whether stat file-mode macros are broken" >&5 if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4758,12 +4772,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:4762: checking for working const" >&5 +echo "configure:4776: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -4833,21 +4847,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:4837: checking for inline" >&5 +echo "configure:4851: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4865: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -4873,12 +4887,12 @@ EOF esac echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:4877: checking for ANSI C header files" >&5 +echo "configure:4891: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4886,7 +4900,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4890: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4904: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4903,7 +4917,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -4921,7 +4935,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -4942,7 +4956,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -4953,7 +4967,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:4957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -4977,12 +4991,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:4981: checking for size_t" >&5 +echo "configure:4995: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -5010,7 +5024,7 @@ EOF fi echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:5014: checking size of long long" >&5 +echo "configure:5028: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5018,7 +5032,7 @@ else ac_cv_sizeof_long_long=0 else cat > conftest.$ac_ext < main() @@ -5029,7 +5043,7 @@ main() exit(0); } EOF -if { (eval echo configure:5033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else @@ -5052,12 +5066,12 @@ EOF if test "$ac_cv_header_linux_joystick_h" = "yes" then echo $ac_n "checking "whether linux/joystick.h uses the Linux 2.2+ API"""... $ac_c" 1>&6 -echo "configure:5056: checking "whether linux/joystick.h uses the Linux 2.2+ API"" >&5 +echo "configure:5070: checking "whether linux/joystick.h uses the Linux 2.2+ API"" >&5 if eval "test \"`echo '$''{'wine_cv_linux_joystick_22_api'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5069,7 +5083,7 @@ int main() { /*empty*/ ; return 0; } EOF -if { (eval echo configure:5073: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5087: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_linux_joystick_22_api=yes else @@ -5096,12 +5110,12 @@ fi if test "$ac_cv_header_sys_vfs_h" = "yes" then echo $ac_n "checking "whether sys/vfs.h defines statfs"""... $ac_c" 1>&6 -echo "configure:5100: checking "whether sys/vfs.h defines statfs"" >&5 +echo "configure:5114: checking "whether sys/vfs.h defines statfs"" >&5 if eval "test \"`echo '$''{'wine_cv_sys_vfs_has_statfs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5118,7 +5132,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5136: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_sys_vfs_has_statfs=yes else @@ -5145,12 +5159,12 @@ fi if test "$ac_cv_header_sys_statfs_h" = "yes" then echo $ac_n "checking "whether sys/statfs.h defines statfs"""... $ac_c" 1>&6 -echo "configure:5149: checking "whether sys/statfs.h defines statfs"" >&5 +echo "configure:5163: checking "whether sys/statfs.h defines statfs"" >&5 if eval "test \"`echo '$''{'wine_cv_sys_statfs_has_statfs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5165,7 +5179,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5183: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_sys_statfs_has_statfs=yes else @@ -5192,12 +5206,12 @@ fi if test "$ac_cv_header_sys_mount_h" = "yes" then echo $ac_n "checking "whether sys/mount.h defines statfs"""... $ac_c" 1>&6 -echo "configure:5196: checking "whether sys/mount.h defines statfs"" >&5 +echo "configure:5210: checking "whether sys/mount.h defines statfs"" >&5 if eval "test \"`echo '$''{'wine_cv_sys_mount_has_statfs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5212,7 +5226,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5216: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5230: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_sys_mount_has_statfs=yes else @@ -5238,7 +5252,7 @@ fi echo $ac_n "checking "for statfs.f_bfree"""... $ac_c" 1>&6 -echo "configure:5242: checking "for statfs.f_bfree"" >&5 +echo "configure:5256: checking "for statfs.f_bfree"" >&5 if eval "test \"`echo '$''{'wine_cv_statfs_bfree'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5247,7 +5261,7 @@ else wine_cv_statfs_bfree=no else cat > conftest.$ac_ext < @@ -5274,7 +5288,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5278: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5292: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_statfs_bfree=yes else @@ -5298,7 +5312,7 @@ EOF fi echo $ac_n "checking "for statfs.f_bavail"""... $ac_c" 1>&6 -echo "configure:5302: checking "for statfs.f_bavail"" >&5 +echo "configure:5316: checking "for statfs.f_bavail"" >&5 if eval "test \"`echo '$''{'wine_cv_statfs_bavail'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5307,7 +5321,7 @@ else wine_cv_statfs_bavail=no else cat > conftest.$ac_ext < @@ -5334,7 +5348,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5338: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5352: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_statfs_bavail=yes else @@ -5359,7 +5373,7 @@ fi echo $ac_n "checking "for working sigaltstack"""... $ac_c" 1>&6 -echo "configure:5363: checking "for working sigaltstack"" >&5 +echo "configure:5377: checking "for working sigaltstack"" >&5 if eval "test \"`echo '$''{'ac_cv_c_working_sigaltstack'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5368,7 +5382,7 @@ else else cat > conftest.$ac_ext < @@ -5406,7 +5420,7 @@ else } EOF -if { (eval echo configure:5410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_working_sigaltstack="yes" else @@ -5433,12 +5447,12 @@ fi echo $ac_n "checking "for msg_accrights in struct msghdr"""... $ac_c" 1>&6 -echo "configure:5437: checking "for msg_accrights in struct msghdr"" >&5 +echo "configure:5451: checking "for msg_accrights in struct msghdr"" >&5 if eval "test \"`echo '$''{'ac_cv_c_msg_accrights'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5446,7 +5460,7 @@ int main() { struct msghdr hdr; hdr.msg_accrights=0 ; return 0; } EOF -if { (eval echo configure:5450: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_msg_accrights="yes" else @@ -5469,12 +5483,12 @@ fi echo $ac_n "checking "whether we need to define __i386__"""... $ac_c" 1>&6 -echo "configure:5473: checking "whether we need to define __i386__"" >&5 +echo "configure:5487: checking "whether we need to define __i386__"" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_def_i386'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #endif -#include +#ifdef HAVE_LINK_H +# include +#endif #ifdef HAVE_SYS_MMAN_H -#include +# include #endif #elif defined(__EMX__) -#include +#ifdef HAVE_A_OUT_H +# include +#endif #else -#include +#ifdef HAVE_A_OUT_H +# include +#endif #endif #ifndef N_UNDF diff --git a/dlls/crtdll/crtdll_main.c b/dlls/crtdll/crtdll_main.c index 359ea7ee497..99efa78bdea 100644 --- a/dlls/crtdll/crtdll_main.c +++ b/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 #include #include diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 21ce643fa1b..242d30ceb94 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -8,9 +8,8 @@ */ #include "config.h" -#ifdef HAVE_UNISTD_H -# include -#endif + +#include #include #include #include @@ -19,7 +18,9 @@ # include #endif #include -#include +#ifdef HAVE_SYS_SOCKET_H +# include +#endif #ifdef HAVE_SYS_SOCKIO_H # include #endif diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index b3a81d89657..034e475920c 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -19,6 +19,8 @@ * - The date manipulations do not support date prior to 1900. * - The parsing does not accept has many formats has the Windows implementation. */ + +#include "config.h" #include "windef.h" #include "oleauto.h" diff --git a/dlls/winaspi/winaspi16.c b/dlls/winaspi/winaspi16.c index e98c4cdde31..66306b9456f 100644 --- a/dlls/winaspi/winaspi16.c +++ b/dlls/winaspi/winaspi16.c @@ -1,3 +1,5 @@ +#include "config.h" + #include #include #include diff --git a/dlls/wnaspi32/winaspi32.c b/dlls/wnaspi32/winaspi32.c index 166656ad21d..5dc77065ad3 100644 --- a/dlls/wnaspi32/winaspi32.c +++ b/dlls/wnaspi32/winaspi32.c @@ -1,3 +1,5 @@ +#include "config.h" + #include #include #include diff --git a/files/directory.c b/files/directory.c index 5966115de01..353c99aaf2d 100644 --- a/files/directory.c +++ b/files/directory.c @@ -4,6 +4,8 @@ * Copyright 1995 Alexandre Julliard */ +#include "config.h" + #include #include #include diff --git a/files/dos_fs.c b/files/dos_fs.c index fc4527cecca..13b65fc3954 100644 --- a/files/dos_fs.c +++ b/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 diff --git a/graphics/ddraw.c b/graphics/ddraw.c index 852649a971c..41619e68b96 100644 --- a/graphics/ddraw.c +++ b/graphics/ddraw.c @@ -22,10 +22,14 @@ #include "ts_xutil.h" #ifdef HAVE_LIBXXSHM -#include -#include -#include -#include "ts_xshm.h" +# include +# ifdef HAVE_SYS_IPC_H +# include +# endif +# ifdef HAVE_SYS_SHM_H +# include +# endif +# include "ts_xshm.h" #endif /* defined(HAVE_LIBXXSHM) */ #ifdef HAVE_LIBXXF86DGA @@ -40,7 +44,9 @@ #include #include -#include +#ifdef HAVE_SYS_SIGNAL_H +# include +#endif #include #include #include diff --git a/graphics/x11drv/dib.c b/graphics/x11drv/dib.c index 24e71a6b249..dd6b8bf3168 100644 --- a/graphics/x11drv/dib.c +++ b/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 +# endif +# ifdef HAVE_SYS_IPC_H +# include +# 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 -#include - DECLARE_DEBUG_CHANNEL(bitmap) DECLARE_DEBUG_CHANNEL(x11drv) diff --git a/include/config.h.in b/include/config.h.in index 69d66c5b6ce..d88778d04f7 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -217,6 +217,15 @@ /* Define if you have the header file. */ #undef HAVE_X11_XPM_H +/* Define if you have the header file. */ +#undef HAVE_A_OUT_H + +/* Define if you have the header file. */ +#undef HAVE_A_OUT_H + +/* Define if you have the header file. */ +#undef HAVE_ARPA_INET_H + /* Define if you have the header file. */ #undef HAVE_ARPA_NAMESER_H @@ -235,6 +244,9 @@ /* Define if you have the header file. */ #undef HAVE_LIBIO_H +/* Define if you have the header file. */ +#undef HAVE_LINK_H + /* Define if you have the header file. */ #undef HAVE_LINUX_CDROM_H @@ -256,9 +268,18 @@ /* Define if you have the header file. */ #undef HAVE_NETINET_IN_H +/* Define if you have the header file. */ +#undef HAVE_NETINET_TCP_H + /* Define if you have the header file. */ #undef HAVE_RESOLV_H +/* Define if you have the header file. */ +#undef HAVE_SCHED_H + +/* Define if you have the header file. */ +#undef HAVE_SOCKET_H + /* Define if you have the header file. */ #undef HAVE_SOUNDCARD_H @@ -277,6 +298,9 @@ /* Define if you have the header file. */ #undef HAVE_SYS_FILIO_H +/* Define if you have the header file. */ +#undef HAVE_SYS_IPC_H + /* Define if you have the header file. */ #undef HAVE_SYS_LWP_H @@ -289,12 +313,21 @@ /* Define if you have the header file. */ #undef HAVE_SYS_MOUNT_H +/* Define if you have the header file. */ +#undef HAVE_SYS_MSG_H + /* Define if you have the header file. */ #undef HAVE_SYS_PARAM_H +/* Define if you have the header file. */ +#undef HAVE_SYS_SHM_H + /* Define if you have the header file. */ #undef HAVE_SYS_SIGNAL_H +/* Define if you have the header file. */ +#undef HAVE_SYS_SOCKET_H + /* Define if you have the header file. */ #undef HAVE_SYS_SOCKIO_H @@ -310,18 +343,27 @@ /* Define if you have the header file. */ #undef HAVE_SYS_SYSCALL_H +/* Define if you have the header file. */ +#undef HAVE_SYS_V86_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_V86INTR_H + /* Define if you have the header file. */ #undef HAVE_SYS_VFS_H +/* Define if you have the header file. */ +#undef HAVE_SYS_VM86_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_WAIT_H + /* Define if you have the header file. */ #undef HAVE_SYSCALL_H /* Define if you have the header file. */ #undef HAVE_UCONTEXT_H -/* Define if you have the header file. */ -#undef HAVE_UNISTD_H - /* Define if you have the header file. */ #undef HAVE_WCTYPE_H diff --git a/loader/dos/dosmod.c b/loader/dos/dosmod.c index 1a44923d707..f80a8b3a5e6 100644 --- a/loader/dos/dosmod.c +++ b/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 #include #include -#include -#include +#ifdef HAVE_SYS_MMAN_H +# include +#endif +#ifdef HAVE_SYS_VM86_H +# include +#endif #include #include #include -#include +#ifdef HAVE_SYS_WAIT_H +# include +#endif #include "dosmod.h" /* FIXME: hack because libc vm86 may be the old syscall version */ diff --git a/loader/dos/dosvm.c b/loader/dos/dosvm.c index 60a002424ee..4ae0422eff1 100644 --- a/loader/dos/dosvm.c +++ b/loader/dos/dosvm.c @@ -6,6 +6,8 @@ * This code hasn't been completely cleaned up yet. */ +#include "config.h" + #include #include #include @@ -34,8 +36,12 @@ DECLARE_DEBUG_CHANNEL(relay) #ifdef MZ_SUPPORTED -#include -#include +#ifdef HAVE_SYS_VM86_H +# include +#endif +#ifdef HAVE_SYS_MMAN_H +# include +#endif #define IF_CLR(ctx) EFL_reg(ctx) &= ~VIF_MASK #define IF_ENABLED(ctx) (EFL_reg(ctx) & VIF_MASK) diff --git a/loader/dos/module.c b/loader/dos/module.c index 4acebc00fdf..df84d265814 100644 --- a/loader/dos/module.c +++ b/loader/dos/module.c @@ -6,6 +6,8 @@ * This code hasn't been completely cleaned up yet. */ +#include "config.h" + #include #include #include @@ -38,7 +40,9 @@ DEFAULT_DEBUG_CHANNEL(module) #ifdef MZ_SUPPORTED -#include +#ifdef HAVE_SYS_MMAN_H +# include +#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 */ diff --git a/loader/pe_image.c b/loader/pe_image.c index ac17fc70472..6eeaa5c9fa8 100644 --- a/loader/pe_image.c +++ b/loader/pe_image.c @@ -33,6 +33,8 @@ * difficult to support... (See mm/filemap.c). */ +#include "config.h" + #include #include #include diff --git a/memory/ldt.c b/memory/ldt.c index aa0ee3b526d..8130feabdbd 100644 --- a/memory/ldt.c +++ b/memory/ldt.c @@ -5,6 +5,8 @@ * Copyright 1995 Alexandre Julliard */ +#include "config.h" + #include #include #include @@ -16,7 +18,10 @@ DEFAULT_DEBUG_CHANNEL(ldt) #ifdef __i386__ #ifdef linux -#include + +#ifdef HAVE_SYS_SYSCALL_H +# include +#endif struct modify_ldt_s { diff --git a/msdos/int21.c b/msdos/int21.c index 0a2adb32eda..4186a8c4b47 100644 --- a/msdos/int21.c +++ b/msdos/int21.c @@ -2,6 +2,8 @@ * DOS interrupt 21h handler */ +#include "config.h" + #include #include #include diff --git a/objects/gdiobj.c b/objects/gdiobj.c index c48e0509807..458293754b0 100644 --- a/objects/gdiobj.c +++ b/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; diff --git a/relay32/snoop.c b/relay32/snoop.c index 2b7699ed171..9c1a2ebeea5 100644 --- a/relay32/snoop.c +++ b/relay32/snoop.c @@ -4,6 +4,7 @@ * Copyright 1998 Marcus Meissner */ +#include "config.h" #include #include diff --git a/scheduler/client.c b/scheduler/client.c index 055695264b8..c2e7dac3575 100644 --- a/scheduler/client.c +++ b/scheduler/client.c @@ -12,7 +12,9 @@ #include #include #include -#include +#ifdef HAVE_SYS_SOCKET_H +# include +#endif #ifdef HAVE_SYS_MMAN_H #include #endif diff --git a/scheduler/thread.c b/scheduler/thread.c index a53a23cabee..7ba3a0c528c 100644 --- a/scheduler/thread.c +++ b/scheduler/thread.c @@ -9,7 +9,9 @@ #include #include #include -#include +#ifdef HAVE_SYS_SOCKET_H +# include +#endif #ifdef HAVE_SYS_MMAN_H #include #endif diff --git a/server/console.c b/server/console.c index c5c26eb6e5d..40d7cd32ac9 100644 --- a/server/console.c +++ b/server/console.c @@ -7,6 +7,8 @@ * the client-side console support. */ +#include "config.h" + #include #include #include diff --git a/server/file.c b/server/file.c index b7e86e7756f..17dd6eee2cf 100644 --- a/server/file.c +++ b/server/file.c @@ -4,6 +4,8 @@ * Copyright (C) 1998 Alexandre Julliard */ +#include "config.h" + #include #include #include diff --git a/server/pipe.c b/server/pipe.c index c99a8afe460..5459f3e0948 100644 --- a/server/pipe.c +++ b/server/pipe.c @@ -4,6 +4,8 @@ * Copyright (C) 1998 Alexandre Julliard */ +#include "config.h" + #include #include #include diff --git a/server/sock.c b/server/sock.c index 9005d65c5b7..f3aa7bb5511 100644 --- a/server/sock.c +++ b/server/sock.c @@ -7,18 +7,27 @@ * on the access of the current handle? */ +#include "config.h" + #include #include #include #include #include #include -#include +#ifdef HAVE_SYS_ERRNO_H +# include +#endif #include #include #include -#include +#ifdef HAVE_SYS_SOCKET_H +# include +#endif #include +#ifdef HAVE_SYS_FILIO_H +# include +#endif #include #include diff --git a/server/socket.c b/server/socket.c index abf1a1021db..c540aac042c 100644 --- a/server/socket.c +++ b/server/socket.c @@ -4,6 +4,8 @@ * Copyright (C) 1998 Alexandre Julliard */ +#include "config.h" + #include #include #include @@ -13,7 +15,9 @@ #include #include #include -#include +#ifdef HAVE_SYS_SOCKET_H +# include +#endif #include #include diff --git a/tools/build.c b/tools/build.c index 65e710646bb..6e0206a3709 100644 --- a/tools/build.c +++ b/tools/build.c @@ -6,6 +6,8 @@ * Copyright 1999 Ulrich Weigand */ +#include "config.h" + #include #include #include diff --git a/tools/fnt2bdf.c b/tools/fnt2bdf.c index 991d76ab26e..0f1691994d5 100644 --- a/tools/fnt2bdf.c +++ b/tools/fnt2bdf.c @@ -7,7 +7,11 @@ * */ -#include +#include "config.h" + +#ifdef HAVE_SYS_PARAM_H +# include +#endif #include #include #include diff --git a/win32/console.c b/win32/console.c index 1661a9477ef..bf04381a146 100644 --- a/win32/console.c +++ b/win32/console.c @@ -19,6 +19,8 @@ * - LYNX/W32. Works mostly, some keys crash it. */ +#include "config.h" + #include #include #include diff --git a/win32/device.c b/win32/device.c index 3294e25bedf..78e17812226 100644 --- a/win32/device.c +++ b/win32/device.c @@ -7,6 +7,8 @@ * */ +#include "config.h" + #include #include #include diff --git a/win32/file.c b/win32/file.c index 67142bd4604..ac55d014f56 100644 --- a/win32/file.c +++ b/win32/file.c @@ -4,6 +4,8 @@ * Copyright 1995 Martin von Loewis, Sven Verdoolaege, and Cameron Heide */ +#include "config.h" + #include #ifdef HAVE_SYS_ERRNO_H #include diff --git a/win32/process.c b/win32/process.c index 1036a89a044..320447d5064 100644 --- a/win32/process.c +++ b/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); diff --git a/windows/dinput.c b/windows/dinput.c index 0b2c0cd52a8..277381d1ecc 100644 --- a/windows/dinput.c +++ b/windows/dinput.c @@ -30,7 +30,9 @@ #include #include #include -#include +#ifdef HAVE_SYS_ERRNO_H +# include +#endif #ifdef HAVE_LINUX_JOYSTICK_H # include # define JOYDEV "/dev/js0"