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

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2015-12-02 19:44:17 +0000 (Wed, 02 Dec 2015)
New Revision: 5848

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

commit 5371d99e8766f25864ddf20fb0866e57fc0b7991
Author: Joseph Myers <joseph at codesourcery.com>
Date:   Fri Jun 12 20:02:30 2015 +0000

    Fix getlogin_r namespace (bug 18527).



Modified: trunk/glibc-ports-2.22/kfreebsd/getlogin_r.c
===================================================================
--- trunk/glibc-ports-2.22/kfreebsd/getlogin_r.c	2015-12-02 19:30:05 UTC (rev 5847)
+++ trunk/glibc-ports-2.22/kfreebsd/getlogin_r.c	2015-12-02 19:44:17 UTC (rev 5848)
@@ -41,7 +41,7 @@
    but SUSV2 wants a return type of 'int'.  */
 
 int
-getlogin_r (char *name, size_t name_len)
+__getlogin_r (char *name, size_t name_len)
 {
   size_t len;
 
@@ -67,4 +67,7 @@
       return ERANGE;
     }
 }
-libc_hidden_def (getlogin_r)
+libc_hidden_def (__getlogin_r)
+weak_alias (__getlogin_r, getlogin_r)
+libc_hidden_weak (getlogin_r)
+