From da1a35297254f08bf33f4b449000352adbf9476f Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Sun, 28 Dec 2008 10:35:02 +0100 Subject: [PATCH] configure: Fix the linux/ipx.h check. --- configure | 5 +++++ configure.ac | 4 ++++ dlls/ws2_32/socket.c | 3 +++ include/config.h.in | 3 +++ 4 files changed, 15 insertions(+) diff --git a/configure b/configure index 6381aed6a32..d0ea3a366b9 100755 --- a/configure +++ b/configure @@ -7442,6 +7442,7 @@ done + for ac_header in \ @@ -7484,6 +7485,7 @@ for ac_header in \ linux/major.h \ linux/param.h \ linux/serial.h \ + linux/types.h \ linux/ucdrom.h \ mach/mach.h \ mach/machine.h \ @@ -8063,6 +8065,9 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef HAVE_SYS_SOCKET_H # include #endif + #ifdef HAVE_LINUX_TYPES_H + # include + #endif #include <$ac_header> _ACEOF diff --git a/configure.ac b/configure.ac index df0eb63ecef..5d7dd5c6c64 100644 --- a/configure.ac +++ b/configure.ac @@ -282,6 +282,7 @@ AC_CHECK_HEADERS(\ linux/major.h \ linux/param.h \ linux/serial.h \ + linux/types.h \ linux/ucdrom.h \ mach/mach.h \ mach/machine.h \ @@ -432,6 +433,9 @@ AC_CHECK_HEADERS([linux/ipx.h],,, #endif #ifdef HAVE_SYS_SOCKET_H # include + #endif + #ifdef HAVE_LINUX_TYPES_H + # include #endif]) AC_CHECK_HEADERS([resolv.h],,, diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b1aea8e3a2c..e44b2e303f9 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -103,6 +103,9 @@ # ifdef HAVE_ASM_TYPES_H # include # endif +# ifdef HAVE_LINUX_TYPES_H +# include +# endif # include # define HAVE_IPX #endif diff --git a/include/config.h.in b/include/config.h.in index b72a6bbc5c9..69c1fee7b32 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -393,6 +393,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LINUX_SERIAL_H +/* Define to 1 if you have the header file. */ +#undef HAVE_LINUX_TYPES_H + /* Define to 1 if you have the header file. */ #undef HAVE_LINUX_UCDROM_H