Module: wine Branch: master Commit: 667bc336fecd380c734c313664134943776ab11f URL: https://source.winehq.org/git/wine.git/?a=commit;h=667bc336fecd380c734c31366...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Mar 13 17:05:06 2019 +0100
configure: Hardcode some headers for Windows platforms.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
configure | 3 --- configure.ac | 3 --- include/config.h.in | 9 --------- include/wine/port.h | 21 ++++++++++++--------- 4 files changed, 12 insertions(+), 24 deletions(-)
diff --git a/configure b/configure index 1818eac..611dd44 100755 --- a/configure +++ b/configure @@ -7296,7 +7296,6 @@ for ac_header in \ asm/types.h \ asm/user.h \ curses.h \ - direct.h \ dirent.h \ dlfcn.h \ elf.h \ @@ -7309,7 +7308,6 @@ for ac_header in \ gsm/gsm.h \ ieeefp.h \ inet/mib2.h \ - io.h \ kstat.h \ libproc.h \ link.h \ @@ -7344,7 +7342,6 @@ for ac_header in \ pcap/pcap.h \ poll.h \ port.h \ - process.h \ pthread.h \ pwd.h \ sched.h \ diff --git a/configure.ac b/configure.ac index 7aa4fb8..9ab6cfc 100644 --- a/configure.ac +++ b/configure.ac @@ -433,7 +433,6 @@ AC_CHECK_HEADERS(\ asm/types.h \ asm/user.h \ curses.h \ - direct.h \ dirent.h \ dlfcn.h \ elf.h \ @@ -446,7 +445,6 @@ AC_CHECK_HEADERS(\ gsm/gsm.h \ ieeefp.h \ inet/mib2.h \ - io.h \ kstat.h \ libproc.h \ link.h \ @@ -481,7 +479,6 @@ AC_CHECK_HEADERS(\ pcap/pcap.h \ poll.h \ port.h \ - process.h \ pthread.h \ pwd.h \ sched.h \ diff --git a/include/config.h.in b/include/config.h.in index 5efa27e..0ff9410 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -110,9 +110,6 @@ /* Define if you have the daylight variable */ #undef HAVE_DAYLIGHT
-/* Define to 1 if you have the <direct.h> header file. */ -#undef HAVE_DIRECT_H - /* Define to 1 if you have the <dirent.h> header file. */ #undef HAVE_DIRENT_H
@@ -333,9 +330,6 @@ /* Define to 1 if you have the <IOKit/IOKitLib.h> header file. */ #undef HAVE_IOKIT_IOKITLIB_H
-/* Define to 1 if you have the <io.h> header file. */ -#undef HAVE_IO_H - /* Define to 1 if you have the `isfinite' function. */ #undef HAVE_ISFINITE
@@ -765,9 +759,6 @@ /* Define to 1 if you have the `pread' function. */ #undef HAVE_PREAD
-/* Define to 1 if you have the <process.h> header file. */ -#undef HAVE_PROCESS_H - /* Define to 1 if you have the `proc_pidinfo' function. */ #undef HAVE_PROC_PIDINFO
diff --git a/include/wine/port.h b/include/wine/port.h index e32818e..7b56013 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -36,15 +36,6 @@ #include <math.h> #include <sys/types.h> #include <sys/stat.h> -#ifdef HAVE_DIRECT_H -# include <direct.h> -#endif -#ifdef HAVE_IO_H -# include <io.h> -#endif -#ifdef HAVE_PROCESS_H -# include <process.h> -#endif #include <string.h> #include <stdlib.h> #ifdef HAVE_UNISTD_H @@ -53,6 +44,18 @@
/**************************************************************** + * Hard-coded values for the Windows platform + */ + +#ifdef _WIN32 + +#include <direct.h> +#include <io.h> +#include <process.h> + +#endif /* _WIN32 */ + +/**************************************************************** * Type definitions */