diff options
| author | Roland McGrath <roland@hack.frob.com> | 2012-07-31 09:42:06 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2012-07-31 09:42:06 -0700 |
| commit | 40ce302d37b7252b71c6d193abc17e6fe82d214d (patch) | |
| tree | 0ebc5099211e3f35de13723e4ac77acbe10086de /inet | |
| parent | 7ecdb005618e9cc351615bb78967387b12b8ed99 (diff) | |
| download | glibc-40ce302d37b7252b71c6d193abc17e6fe82d214d.zip glibc-40ce302d37b7252b71c6d193abc17e6fe82d214d.tar.gz glibc-40ce302d37b7252b71c6d193abc17e6fe82d214d.tar.bz2 | |
Conditionalize use of PTR_MANGLE.
Diffstat (limited to 'inet')
| -rw-r--r-- | inet/getnetgrent_r.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/inet/getnetgrent_r.c b/inet/getnetgrent_r.c index 2e280e7..70cc14c 100644 --- a/inet/getnetgrent_r.c +++ b/inet/getnetgrent_r.c @@ -1,5 +1,4 @@ -/* Copyright (C) 1996,1997,1998,1999,2002,2004,2005,2007,2011 - Free Software Foundation, Inc. +/* Copyright (C) 1996-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -57,14 +56,18 @@ setup (void **fctp, service_user **nipp) same result every time. So we need no locking. */ no_more = __nss_netgroup_lookup (nipp, "setnetgrent", fctp); startp = no_more ? (service_user *) -1 : *nipp; +#ifdef PTR_MANGLE PTR_MANGLE (startp); +#endif atomic_write_barrier (); startp_initialized = true; } else { service_user *nip = startp; +#ifdef PTR_DEMANGLE PTR_DEMANGLE (nip); +#endif if (nip == (service_user *) -1) /* No services at all. */ return 1; |