NaCl: Fix glob.c build after getlogin_r -> __getlogin_r.

diff --git a/ChangeLog b/ChangeLog
index ceeadda944a016e377fce527af864c9571b75985..333b69048c4f2e64156a7ce752bd37c45d65e7cf 100644 (file)
--- 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 36d62e807dec238964fbefc511d89b583a3f8b4b..eda6e9e1101c4587a69963e22bbe1a9b0f7c28d5 100644 (file)
--- 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>