diff options
| -rw-r--r-- | libc/inet/resolv.c | 7 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/getdomainname.c | 15 |
2 files changed, 3 insertions, 19 deletions
diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c index c6807aae1..dc2ae7ba3 100644 --- a/libc/inet/resolv.c +++ b/libc/inet/resolv.c @@ -226,11 +226,6 @@ #define IF_HAS_BOTH(...) #endif - -extern int __libc_getdomainname(char *name, size_t len); -libc_hidden_proto(__libc_getdomainname) - - #define MAX_RECURSE 5 #define MAX_ALIASES 5 @@ -1671,7 +1666,7 @@ int getnameinfo(const struct sockaddr *sa, socklen_t addrlen, char *host, #undef min #define min(x,y) (((x) > (y)) ? (y) : (x)) if ((flags & NI_NOFQDN) - && (__libc_getdomainname(domain, sizeof(domain)) == 0) + && (getdomainname(domain, sizeof(domain)) == 0) && (c = strstr(h->h_name, domain)) != NULL && (c != h->h_name) && (*(--c) == '.') ) { diff --git a/libc/sysdeps/linux/common/getdomainname.c b/libc/sysdeps/linux/common/getdomainname.c index c561aa305..20b09610a 100644 --- a/libc/sysdeps/linux/common/getdomainname.c +++ b/libc/sysdeps/linux/common/getdomainname.c @@ -16,13 +16,7 @@ /* Experimentally off - libc_hidden_proto(strcpy) */ /* libc_hidden_proto(uname) */ -#if !defined __UCLIBC_BSD_SPECIFIC__ -extern int getdomainname (char *__name, size_t __len) - __THROW __nonnull ((1)) __wur; -#endif -extern __typeof(getdomainname) __libc_getdomainname; -libc_hidden_proto(__libc_getdomainname) -int __libc_getdomainname(char *name, size_t len) +int getdomainname(char *name, size_t len) { struct utsname uts; @@ -48,10 +42,5 @@ int __libc_getdomainname(char *name, size_t len) #endif return 0; } -libc_hidden_def(__libc_getdomainname) -#if defined __UCLIBC_BSD_SPECIFIC__ -/* libc_hidden_proto(getdomainname) */ -weak_alias(__libc_getdomainname,getdomainname) -libc_hidden_weak(getdomainname) -#endif /* __UCLIBC_BSD_SPECIFIC__ */ +libc_hidden_def(getdomainname) #endif |