Move ifaddrs.h from uClibc-internal location libc/inet/ to include/, and make

it conditionally included among the installed header files depending on
UCLIBC_HAS_AI_ADDRCONFIG.

diff --git a/Makefile.in b/Makefile.in
index 5a8df8c..7981324 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -331,6 +331,10 @@ ifneq ($(UCLIBC_HAS_CRYPT),y)
        # Remove crypt.h since libcrypt was disabled upon request
        $(RM) $(PREFIX)$(DEVEL_PREFIX)include/crypt.h
 endif
+ifneq ($(UCLIBC_SUPPORT_AI_ADDRCONFIG),y)
+       # Remove ifaddrs.h since the corresponding functionality is disabled
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/ifaddrs.h
+endif
 
 # Installs development library links.
 install_dev: install_headers

diff --git a/libc/inet/ifaddrs.h b/include/ifaddrs.h
similarity index 100%
rename from libc/inet/ifaddrs.h
rename to include/ifaddrs.h

diff --git a/libc/inet/getaddrinfo.c b/libc/inet/getaddrinfo.c
index d35d33f..fa94303 100644 (file)
--- a/libc/inet/getaddrinfo.c
+++ b/libc/inet/getaddrinfo.c
@@ -68,7 +68,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.c b/libc/inet/ifaddrs.c
index a96b19a..c60dcf7 100644 (file)
--- a/libc/inet/ifaddrs.c
+++ b/libc/inet/ifaddrs.c
@@ -22,7 +22,7 @@
 #include <alloca.h>
 #include <assert.h>
 #include <errno.h>
-#include "ifaddrs.h"
+#include <ifaddrs.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netpacket/packet.h>