diff options
| author | Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com> | 2016-07-11 14:16:01 -0300 |
|---|---|---|
| committer | Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com> | 2016-07-11 14:16:01 -0300 |
| commit | bde2a94b61d1cef444d7d4b4b9db70062c48cf5d (patch) | |
| tree | 5393a8c666de2fb8995df1282909c09ed17d9351 /sysdeps/generic | |
| parent | 3f1ff80d9a0c60398e73d62c52f9a2f06af8d61d (diff) | |
| parent | 66986dec455c2011085a04b72a5bd55d9f9c7d1c (diff) | |
| download | glibc-ibm/2.19/master.zip glibc-ibm/2.19/master.tar.gz glibc-ibm/2.19/master.tar.bz2 | |
Merge branch 'release/2.19/master' into ibm/2.19/masteribm/2.19/master
Conflicts:
NEWS
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index ffeb093..9d767b6 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -590,9 +590,6 @@ struct rtld_global_ro /* List of auditing interfaces. */ struct audit_ifaces *_dl_audit; unsigned int _dl_naudit; - - /* 0 if internal pointer values should not be guarded, 1 if they should. */ - EXTERN int _dl_pointer_guard; }; # define __rtld_global_attribute__ # ifdef IS_IN_rtld |