wsock32: Add a fallback for inet_network.

0dff81f4 · Huw Davies · Alexandre Julliard · 9273a671 · 0dff81f4 · 0dff81f4
Commit 0dff81f4 authored Oct 15, 2013 by Huw Davies Committed by Alexandre Julliard Oct 15, 2013
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

configure configure +1 -0

configure.ac configure.ac +1 -0

protocol.c dlls/wsock32/protocol.c +2 -0

config.h.in include/config.h.in +3 -0

No files found.
--- a/configure
+++ b/configure
@@ -14338,6 +14338,7 @@ for ac_func in \
 	getprotobyname \
 	getprotobynumber \
 	getservbyport \
+	inet_addr \
 	inet_network \
 	inet_ntop \
 	inet_pton \

--- a/configure.ac
+++ b/configure.ac
@@ -2130,6 +2130,7 @@ AC_CHECK_FUNCS(\
 	getprotobyname \
 	getprotobynumber \
 	getservbyport \
+	inet_addr \
 	inet_network \
 	inet_ntop \
 	inet_pton \

--- a/dlls/wsock32/protocol.c
+++ b/dlls/wsock32/protocol.c
@@ -51,6 +51,8 @@ UINT WINAPI WSOCK32_inet_network(const char *cp)
 {
 #ifdef HAVE_INET_NETWORK
    return inet_network(cp);
+#elif defined(HAVE_INET_ADDR)
+    return ntohl( inet_addr( cp ) );
 #else
    return 0;
 #endif

--- a/include/config.h.in
+++ b/include/config.h.in
@@ -264,6 +264,9 @@
 /* Define to 1 if you have the `if_nameindex' function. */
 #undef HAVE_IF_NAMEINDEX

+/* Define to 1 if you have the `inet_addr' function. */
+#undef HAVE_INET_ADDR
+
 /* Define to 1 if you have the <inet/mib2.h> header file. */
 #undef HAVE_INET_MIB2_H