Merge branch 'jk/http-push-to-empty' into maint

[git.git] / compat / inet_pton.c

diff --git a/compat/inet_pton.c b/compat/inet_pton.c
index 4078fc0877ca99c82152acdd6b7a9eef70a9f8a4..2ec995e63d0cdef6dcd8b2fd6ea7aa544f4d1b33 100644 (file)
--- a/compat/inet_pton.c
+++ b/compat/inet_pton.c
@@ -17,9 +17,9 @@
 
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
+
+#include "../git-compat-util.h"
+
 #include <stdio.h>
 #include <string.h>
 
@@ -41,7 +41,9 @@
  */
 
 static int inet_pton4(const char *src, unsigned char *dst);
+#ifndef NO_IPV6
 static int inet_pton6(const char *src, unsigned char *dst);
+#endif
 
 /* int
  * inet_pton4(src, dst)