aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-05-24 05:20:48 +0000
committerUlrich Drepper <drepper@redhat.com>2004-05-24 05:20:48 +0000
commit2c55cb995b06079e45ccc158755ac34791ce46ac (patch)
tree43d0453d4fbd1dd5331b2591a6fb28f61427e7cb
parent9c8b466ea932088c1c11f26110025c0f366144f4 (diff)
downloadglibc-2c55cb995b06079e45ccc158755ac34791ce46ac.tar
glibc-2c55cb995b06079e45ccc158755ac34791ce46ac.tar.gz
glibc-2c55cb995b06079e45ccc158755ac34791ce46ac.tar.bz2
glibc-2c55cb995b06079e45ccc158755ac34791ce46ac.zip
Don't allow linking with _obstack.
-rw-r--r--malloc/obstack.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/malloc/obstack.c b/malloc/obstack.c
index 4b3ccda906..fddda3ec5b 100644
--- a/malloc/obstack.c
+++ b/malloc/obstack.c
@@ -25,6 +25,7 @@
#ifdef _LIBC
# include <obstack.h>
+# include <shlib-compat.h>
#else
# include "obstack.h"
#endif
@@ -96,10 +97,13 @@ int obstack_exit_failure = EXIT_FAILURE;
# endif
# ifdef _LIBC
+# if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)
/* A looong time ago (before 1994, anyway; we're not sure) this global variable
was used by non-GNU-C macros to avoid multiple evaluation. The GNU C
library still exports it because somebody might use it. */
-struct obstack *_obstack;
+struct obstack *_obstack_compat;
+compat_symbol (libc, _obstack_compat, _obstack, GLIBC_2_0);
+# endif
# endif
/* Define a macro that either calls functions with the traditional malloc/free