diff options
| author | Roland McGrath <roland@hack.frob.com> | 2015-06-24 15:29:53 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2015-06-24 15:29:53 -0700 |
| commit | 5ba4a6eb9f938872bffb6fc2f2a49437fa943135 (patch) | |
| tree | 6fcb8dc9f33148f1b2c6e4838bd0b7b44b4089e2 | |
| parent | a67894c505d44c3a5292804c37d318684d2be469 (diff) | |
| download | glibc-5ba4a6eb9f938872bffb6fc2f2a49437fa943135.tar.gz glibc-5ba4a6eb9f938872bffb6fc2f2a49437fa943135.tar.xz glibc-5ba4a6eb9f938872bffb6fc2f2a49437fa943135.zip | |
NaCl: Fix glob.c build after getlogin_r -> __getlogin_r.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | 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> |