PATCH to fix dlls/iphlpapi/iphlpapi_main.c breakage

Gerald Pfeifer pfeifer at dbai.tuwien.ac.at
Mon Aug 11 02:15:21 CDT 2003


[ In fact, this fixes autoconf breakage, that manifested itself in
  dlls/iphlpapi/iphlpapi_main.c. ]

The following change

  revision 1.5
  date: 2003/08/08 21:07:23;  author: julliard;  state: Exp;  lines: +6 -3
  Patrik Stridvall <ps at leissner.se>
  Fixed some issues found by winapi_check.

broke the build on FreeBSD with the following failure mode:

  iphlpapi_main.c: In function `GetNetworkParams':
  iphlpapi_main.c:875: `_res' undeclared (first use in this function)
  iphlpapi_main.c:875: (Each undeclared identifier is reported only once
  iphlpapi_main.c:875: for each function it appears in.)

However, not the change itself is buggy, but our autoconf tests for
resolv.h were broken, and we just had failed to notice.  Fixed thusly.

Gerald

ChangeLog:
resolv.h may require netinet/in.h, so try to #include that when checking
for the former.

Index: configure.ac
===================================================================
RCS file: /home/wine/wine/configure.ac,v
retrieving revision 1.169
diff -u -3 -p -r1.169 configure.ac
--- configure.ac	2 Aug 2003 00:52:03 -0000	1.169
+++ configure.ac	10 Aug 2003 20:02:00 -0000
@@ -1072,10 +1072,19 @@ AC_CHECK_HEADERS(sys/mount.h sys/user.h,
      # include <sys/param.h>
      #endif])

-AC_CHECK_HEADERS([net/if.h net/if_arp.h net/if_dl.h net/if_types.h net/route.h resolv.h],,,
+AC_CHECK_HEADERS([net/if.h net/if_arp.h net/if_dl.h net/if_types.h net/route.h],,,
     [#include <sys/types.h>
      #if HAVE_SYS_SOCKET_H
      # include <sys/socket.h>
+     #endif])
+
+AC_CHECK_HEADERS([resolv.h],,,
+    [#include <sys/types.h>
+     #if HAVE_SYS_SOCKET_H
+     # include <sys/socket.h>
+     #endif
+     #if HAVE_NETINET_IN_H
+     # include <netinet/in.h>
      #endif])

 AC_CHECK_HEADERS(netinet/ip.h,,,



More information about the wine-patches mailing list