Removed include/ifaddrs.h and put contents in libc/inet/ifaddrs.h, as we do not

need the file outside of uClibc anyway.

3 files changed, 16 insertions, 20 deletions

diff --git a/include/ifaddrs.h b/include/ifaddrs.h
deleted file mode 100644
index 90ab481a3..000000000
--- a/include/ifaddrs.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef _IFADDRS_H
-#include <libc/inet/ifaddrs.h>
-#include <stdbool.h>
-#include <stdint.h>
-
-struct in6addrinfo
-{
-  enum {
-    in6ai_deprecated = 1,
-    in6ai_temporary = 2,
-    in6ai_homeaddress = 4
-  } flags;
-  uint32_t addr[4];
-};
-
-extern void __check_pf (bool *seen_ipv4, bool *seen_ipv6)
-  attribute_hidden;
-
-#endif	/* ifaddrs.h */
diff --git a/libc/inet/getaddrinfo.c b/libc/inet/getaddrinfo.c
index 0bc66e393..8b735f29b 100644
--- a/libc/inet/getaddrinfo.c
+++ b/libc/inet/getaddrinfo.c
@@ -66,7 +66,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <sys/un.h>
 #include <sys/utsname.h>
 #include <net/if.h>
-#include <ifaddrs.h>
+#include "ifaddrs.h"
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
 /* Experimentally off - libc_hidden_proto(memset) */
diff --git a/libc/inet/ifaddrs.h b/libc/inet/ifaddrs.h
index ba6a1554b..2cc06ec86 100644
--- a/libc/inet/ifaddrs.h
+++ b/libc/inet/ifaddrs.h
@@ -22,6 +22,8 @@
 
 #include <features.h>
 #include <sys/socket.h>
+#include <stdbool.h>
+#include <stdint.h>
 
 __BEGIN_DECLS
 
@@ -71,4 +73,17 @@ extern void freeifaddrs (struct ifaddrs *__ifa)  __THROW;
 
 __END_DECLS
 
+struct in6addrinfo
+{
+  enum {
+    in6ai_deprecated = 1,
+    in6ai_temporary = 2,
+    in6ai_homeaddress = 4
+  } flags;
+  uint32_t addr[4];
+};
+
+extern void __check_pf (bool *seen_ipv4, bool *seen_ipv6)
+  attribute_hidden;
+
 #endif /* ifaddrs.h */