decl2.c (do_nonmember_using_decl): Allow `extern "C"' declarations from…

decl2.c (do_nonmember_using_decl): Allow `extern "C"' declarations from different namespaces to be combined.

	* decl2.c (do_nonmember_using_decl): Allow `extern "C"'
	declarations from different namespaces to be combined.

From-SVN: r37254

gcc/cp/ChangeLog

+2000-11-04  Mark Mitchell  <mark@codesourcery.com>
+
+	* decl2.c (do_nonmember_using_decl): Allow `extern "C"'
+	declarations from different namespaces to be combined.
+
 2000-11-03  Zack Weinberg  <zack@wolery.stanford.edu>
 
 	* decl.c: Include tm_p.h.

gcc/cp/decl2.c

@@ -5204,10 +5204,12 @@ do_nonmember_using_decl (scope, name, oldval, oldtype, newval, newtype)
 		  && compparms (TYPE_ARG_TYPES (TREE_TYPE (new_fn)),
 				TYPE_ARG_TYPES (TREE_TYPE (old_fn))))
 		{
-		  /* There was already a non-using declaration in
-		     this scope with the same parameter types.  */
-		  cp_error ("`%D' is already declared in this scope",
-			    name);
+		  if (!(DECL_EXTERN_C_P (new_fn)
+			&& DECL_EXTERN_C_P (old_fn)))
+		    /* There was already a non-using declaration in
+		       this scope with the same parameter types.  */
+		    cp_error ("`%D' is already declared in this scope",
+			      name);
 		  break;
 		}
 	      else if (duplicate_decls (new_fn, old_fn))

gcc/testsuite/g++.old-deja/g++.ns/using14.C

+// Build don't link:
+// Origin: Mark Mitchell <mark@codesourcery.com>
+
+extern "C" void f ();
+
+namespace N {
+extern "C" void f ();
+}
+
+using N::f;
+
+void g ()
+{
+  f ();
+}