svn commit: trunk/uClibc/libc: inet sysdeps/linux/common

vda at uclibc.org vda at uclibc.org
Wed Dec 10 16:40:40 UTC 2008


Author: vda
Date: 2008-12-10 08:40:40 -0800 (Wed, 10 Dec 2008)
New Revision: 24361

Log:
remove __libc_getdomainname alias. google says only we have it.



Modified:
   trunk/uClibc/libc/inet/resolv.c
   trunk/uClibc/libc/sysdeps/linux/common/getdomainname.c


Changeset:
Modified: trunk/uClibc/libc/inet/resolv.c
===================================================================
--- trunk/uClibc/libc/inet/resolv.c	2008-12-10 14:14:09 UTC (rev 24360)
+++ trunk/uClibc/libc/inet/resolv.c	2008-12-10 16:40:40 UTC (rev 24361)
@@ -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 @@
 #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) == '.')
 					) {

Modified: trunk/uClibc/libc/sysdeps/linux/common/getdomainname.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/getdomainname.c	2008-12-10 14:14:09 UTC (rev 24360)
+++ trunk/uClibc/libc/sysdeps/linux/common/getdomainname.c	2008-12-10 16:40:40 UTC (rev 24361)
@@ -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 @@
 #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




More information about the uClibc-cvs mailing list