aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/nacl/glob.c4
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>