diff options
| author | Ricard Wanderlof <ricard.wanderlof@axis.com> | 2008-08-28 07:33:17 +0000 |
|---|---|---|
| committer | Ricard Wanderlof <ricard.wanderlof@axis.com> | 2008-08-28 07:33:17 +0000 |
| commit | 7253e71055129d7dac7b56608c745dab036260ca (patch) | |
| tree | 9b058f2724437bf3b8fbb4c6c5d11752023b8df6 | |
| parent | 1372e95c24d3ec786f43e7281663d93e981db67a (diff) | |
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.
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | include/ifaddrs.h (renamed from libc/inet/ifaddrs.h) | 0 | ||||
| -rw-r--r-- | libc/inet/getaddrinfo.c | 2 | ||||
| -rw-r--r-- | libc/inet/ifaddrs.c | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 5a8df8c55..7981324a0 100644 --- 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 index ba6a1554b..ba6a1554b 100644 --- a/libc/inet/ifaddrs.h +++ b/include/ifaddrs.h diff --git a/libc/inet/getaddrinfo.c b/libc/inet/getaddrinfo.c index d35d33fe0..fa943034d 100644 --- 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 a96b19a54..c60dcf76d 100644 --- 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> |