From 5ba4a6eb9f938872bffb6fc2f2a49437fa943135 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@hack.frob.com>
Date: Wed, 24 Jun 2015 15:29:53 -0700
Subject: NaCl: Fix glob.c build after getlogin_r -> __getlogin_r.

---
 ChangeLog           | 5 +++++
 sysdeps/nacl/glob.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ceeadda944..333b69048c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-24  Roland McGrath  <roland@hack.frob.com>
+
+	* sysdeps/nacl/glob.c (getlogin_r): Macro renamed to ...
+	(__getlogin_r): ... this.
+
 2015-06-24  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #18594]
diff --git a/sysdeps/nacl/glob.c b/sysdeps/nacl/glob.c
index 36d62e807d..eda6e9e110 100644
--- a/sysdeps/nacl/glob.c
+++ b/sysdeps/nacl/glob.c
@@ -16,11 +16,11 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include <unistd.h>			/* Declares getlogin_r.  */
+#include <unistd.h>			/* Declares __getlogin_r.  */
 
 /* We do not have getlogin_r in the library at all for NaCl.
    Define it away so the glob code does not try to use it.  */
-#define getlogin_r(name, len)		(ENOSYS)
+#define __getlogin_r(name, len)		(ENOSYS)
 
 /* Fetch the version that defines glob64 as an alias.  */
 #include <sysdeps/wordsize-64/glob.c>
-- 
cgit 1.4.1