about summary refs log tree commit diff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2012-08-06 14:47:35 -0700
committerH.J. Lu <hjl.tools@gmail.com>2012-08-06 14:47:35 -0700
commitc5757acd6e9aafcf042b6cd6d7f9e70d957e1e3a (patch)
treef0ea18a6af9051c7a2be6797aa1b5b8a22cb8004
parent3a31811edef1298b33815d1760a2a1fdd563411d (diff)
downloadglibc-c5757acd6e9aafcf042b6cd6d7f9e70d957e1e3a.tar.gz
glibc-c5757acd6e9aafcf042b6cd6d7f9e70d957e1e3a.tar.xz
glibc-c5757acd6e9aafcf042b6cd6d7f9e70d957e1e3a.zip
Remove __secure_getenv in 2.17 instead of 2.16
-rw-r--r--ChangeLog5
-rw-r--r--stdlib/secure-getenv.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 127ee01e98..81bc264ab6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2012-08-06  H.J. Lu  <hongjiu.lu@intel.com>
 
+	* stdlib/secure-getenv.c (__secure_getenv): Replace
+	GLIBC_2_16 with GLIBC_2_17.
+
+2012-08-06  H.J. Lu  <hongjiu.lu@intel.com>
+
 	* sysdeps/unix/sysv/linux/x86_64/x32/iofopen.c: Removed.
 	* sysdeps/unix/sysv/linux/x86_64/x32/iofopen64.c: Likewise.
 
diff --git a/stdlib/secure-getenv.c b/stdlib/secure-getenv.c
index 2e696e90f0..7634faea84 100644
--- a/stdlib/secure-getenv.c
+++ b/stdlib/secure-getenv.c
@@ -32,6 +32,6 @@ __libc_secure_getenv (name)
 weak_alias (__libc_secure_getenv, secure_getenv)
 libc_hidden_weak (__libc_secure_getenv)
 
-#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_16)
+#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_17)
 compat_symbol (libc, __libc_secure_getenv, __secure_getenv, GLIBC_2_0);
 #endif