From 11033ba5226589d2e7a7055cda6ddf0379f7cad1 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Mon, 17 Apr 2000 02:00:23 +0000 Subject: decl.c (decls_match): Allow a redeclaration of a builtin to specify args while the builtin did not. * decl.c (decls_match): Allow a redeclaration of a builtin to specify args while the builtin did not. From-SVN: r33195 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/decl.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'gcc') diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ca2ac71..4634c2e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2000-04-16 Jason Merrill + + * decl.c (decls_match): Allow a redeclaration of a builtin to + specify args while the builtin did not. + 2000-04-15 Mark Mitchell * cp-tree.def (THUNK_DECL): Add to documentation. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 69a868f..2760ea5 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -2936,7 +2936,8 @@ decls_match (newdecl, olddecl) if (same_type_p (TREE_TYPE (f1), TREE_TYPE (f2))) { - if (! strict_prototypes_lang_c && DECL_LANGUAGE (olddecl) == lang_c + if ((! strict_prototypes_lang_c || DECL_BUILT_IN (olddecl)) + && DECL_LANGUAGE (olddecl) == lang_c && p2 == NULL_TREE) { types_match = self_promoting_args_p (p1); -- cgit v1.1