cp-demangle.h: Declare cplus_demangle_operators...

libiberty:
	* cp-demangle.h: Declare cplus_demangle_operators,
	cplus_demangle_builtin_types, cplus_demangle_mangled_name, and
	cplus_demangle_type as static if IN_GLIBCPP_V3.
libobjc:
	* encoding.c: Rename target_flags with a #define to avoid
	conflict with a prior declaration.

From-SVN: r83800

2 files changed, 36 insertions, 28 deletions

diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index 3e8c9564d14..b311888a355 100644
--- a/libobjc/ChangeLog
+++ b/libobjc/ChangeLog
@@ -1,7 +1,12 @@
+2004-06-28  Zack Weinberg  <zack@codesourcery.com>
+
+	* encoding.c: Rename target_flags with a #define to avoid
+	conflict with a prior declaration.
+
 2004-06-24  Andrew Pinski  <apinski@apple.com>
 
 	* objc/encoding.h: Wrap the functions with extern "C" for C++
-	mode. 
+	mode.
 	* objc/hash.h: Likewise.
 	* objc/objc-api.h: Likewise.
 	* objc/objc-list.h: Likewise.
@@ -18,10 +23,10 @@
 
 2004-06-20  Alexander Malmberg  <alexander@malmberg.org>
 
-        * Makefile.in (exception.lo): Remove $(OBJC_GCFLAGS).
-        (exception_gc.lo): New.
-        (OBJS_GC): Add exception_gc.lo.
-	
+	* Makefile.in (exception.lo): Remove $(OBJC_GCFLAGS).
+	(exception_gc.lo): New.
+	(OBJS_GC): Add exception_gc.lo.
+
 2004-06-17  Richard Henderson  <rth@redhat.com>
 
 	* exception.c: New file.
@@ -74,30 +79,30 @@
 
 	Merge from the libobjc-branch
 	2004-02-09  Andrew Pinski  <pinskia@physics.uc.edu>
-	
+
 		* Makefile.in (OBJC_H): Change objc-deps.h to objc-decls.h.
-	
+
 	2004-02-03  Andrew Pinski  <pinskia@physics.uc.edu>
-	
+
 		* Makefile.in (OBJC_H): Add objc-deps.h.
-	
+
 	2004-01-27  Nicola Pero  <n.pero@mi.flashnet.it>
-	
+
 		* Protocol.m ([-conformsTo:]): If the argument is nil, return NO.
 		([-hash], [-isEqual:]): New methods.
-	
+
 	2004-01-27  Richard Frith-Macdonald <rfm@gnu.org>
-	
+
 		* sarray.c (sarray_free): Add a better comment.
-	
+
 	2004-01-27  Adam Fedor  <fedor@gnu.org>
-	
+
 		* hash.c (hash_add): Cast cachep to int.
 		* selector.c (__sel_register_typed_name): Cast
 		soffset_decode to int.
-	
+
 	2004-01-27  Alexander Malmberg  <alexander@malmberg.org>
-	
+
 		* selector.c: Rename register_selectors_from_list to
 		__objc_register_selectors_from_list. Update caller.
 		(__objc_register_selectors_from_list): Lock __objc_runtime_mutex
@@ -109,30 +114,30 @@
 		* sendmsg.c (class_add_method_list): Use
 		__objc_register_selectors_from_list.
 		* objc/runtime.h: Add __objc_register_selectors_from_list.
-	
+
 	2004-01-25  Adam Fedor  <fedor@gnu.org>
-	            Nicola Pero  <n.pero@mi.flashnet.it>
-	            Andrew Pinski  <pinskia@physics.uc.edu>
-	
+		    Nicola Pero  <n.pero@mi.flashnet.it>
+		    Andrew Pinski  <pinskia@physics.uc.edu>
+
 		* objc/objc-decls.h: New file.
 		* objc/objc-api.h (_objc_lookup_class): Mark as export.
 		(_objc_load_callback): Likewise.
 		(_objc_object_alloc): Likewise.
 		(_objc_object_copy): Likewise.
 		(_objc_object_dispose): Likewise.
-	
+
 	2004-01-25  Andrew Pinski  <pinskia@physics.uc.edu>
-	
+
 		* archive.c: s/__inline__/inline
-		* sendmsg.c: Likewise. 
-	
+		* sendmsg.c: Likewise.
+
 		* encoding.c: Remove FIXME about the warning
 		about unused variable.
 		* sendmsg.c: Add a FIXME comment saying that
 		this should be using libffi.
-	
+
 		* Makefile.in (LIBTOOL): Use @LIBTOOL@ now as it works.
-	
+
 
 2004-05-13  Andrew Pinski  <pinskia@physics.uc.edu>
 
diff --git a/libobjc/encoding.c b/libobjc/encoding.c
index 248ab10bd9a..dba203204b6 100644
--- a/libobjc/encoding.c
+++ b/libobjc/encoding.c
@@ -86,8 +86,11 @@ Boston, MA 02111-1307, USA.  */
 #define STRUCTURE_SIZE_BOUNDARY (BITS_PER_UNIT * sizeof (struct{char a;}))
 
 /* Some ROUND_TYPE_ALIGN macros use TARGET_foo, and consequently
-   target_flags.  Define a dummy entry here to so we don't die.  */
-static int __attribute__ ((__unused__)) target_flags = 0;
+   target_flags.  Define a dummy entry here to so we don't die.
+   We have to rename it because target_flags may already have been
+   declared extern.  */
+#define target_flags not_target_flags
+static int __attribute__ ((__unused__)) not_target_flags = 0;
 
 
 /*  FIXME: while this file has no business including tm.h, this