svn commit: trunk/uClibc: include libc/inet

[ricardw at uclibc.org]

Author: ricardw
Date: 2008-06-27 08:38:41 -0700 (Fri, 27 Jun 2008)
New Revision: 22534

Log:
Removed include/ifaddrs.h and put contents in libc/inet/ifaddrs.h, as we do not
need the file outside of uClibc anyway.

Removed:
   trunk/uClibc/include/ifaddrs.h

Modified:
   trunk/uClibc/libc/inet/getaddrinfo.c
   trunk/uClibc/libc/inet/ifaddrs.h


Changeset:
Deleted: trunk/uClibc/include/ifaddrs.h
===================================================================
--- trunk/uClibc/include/ifaddrs.h	2008-06-27 15:29:48 UTC (rev 22533)
+++ trunk/uClibc/include/ifaddrs.h	2008-06-27 15:38:41 UTC (rev 22534)
@@ -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 */

Modified: trunk/uClibc/libc/inet/getaddrinfo.c
===================================================================
--- trunk/uClibc/libc/inet/getaddrinfo.c	2008-06-27 15:29:48 UTC (rev 22533)
+++ trunk/uClibc/libc/inet/getaddrinfo.c	2008-06-27 15:38:41 UTC (rev 22534)
@@ -66,7 +66,7 @@
 #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) */

Modified: trunk/uClibc/libc/inet/ifaddrs.h
===================================================================
--- trunk/uClibc/libc/inet/ifaddrs.h	2008-06-27 15:29:48 UTC (rev 22533)
+++ trunk/uClibc/libc/inet/ifaddrs.h	2008-06-27 15:38:41 UTC (rev 22534)
@@ -22,6 +22,8 @@
 
 #include <features.h>
 #include <sys/socket.h>
+#include <stdbool.h>
+#include <stdint.h>
 
 __BEGIN_DECLS
 
@@ -71,4 +73,17 @@
 
 __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 */