[Glibc-bsd-commits] r5855 - trunk/glibc-ports-2.22/kfreebsd

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2015-12-04 11:04:36 +0000 (Fri, 04 Dec 2015)
New Revision: 5855

Modified:
   trunk/glibc-ports-2.22/kfreebsd/ifaddrs.c
Log:
Merge from upstream:

commit 7f994279e900954f2b220a02fa01f2042eef74b1
Author: Joseph Myers <joseph at codesourcery.com>
Date:   Tue Dec 2 23:11:09 2014 +0000

    Fix getifaddrs, freeifaddrs namespace (bug 17668).



Modified: trunk/glibc-ports-2.22/kfreebsd/ifaddrs.c
===================================================================
--- trunk/glibc-ports-2.22/kfreebsd/ifaddrs.c	2015-12-03 16:27:06 UTC (rev 5854)
+++ trunk/glibc-ports-2.22/kfreebsd/ifaddrs.c	2015-12-04 11:04:36 UTC (rev 5855)
@@ -77,7 +77,7 @@
 #define MAX_SYSCTL_TRY 5
 
 int
-getifaddrs(struct ifaddrs **pif)
+__getifaddrs(struct ifaddrs **pif)
 {
 	int icnt = 1;
 	int dcnt = 0;
@@ -369,12 +369,14 @@
 	}
 	return (0);
 }
-libc_hidden_def (getifaddrs)
+weak_alias (__getifaddrs, getifaddrs)
+libc_hidden_weak (getifaddrs)
 
 void
-freeifaddrs(struct ifaddrs *ifp)
+__freeifaddrs(struct ifaddrs *ifp)
 {
 
 	free(ifp);
 }
-libc_hidden_def (freeifaddrs)
+weak_alias (__freeifaddrs, freeifaddrs)
+libc_hidden_weak (freeifaddrs)