From e7cf6513659ea98692acb6611bc7ccca1246f760 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Wed, 14 Nov 2012 20:53:48 -0500
Subject: [PATCH] re PR c++/37276 (Trouble with some (C99?) math builtins and
namespace std)
PR c++/37276
* decl.c (decls_match): Remove #ifdef around earlier fix.
From-SVN: r193526
---
gcc/cp/ChangeLog | 5 +++++
gcc/cp/decl.c | 2 --
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index af55e29add39..dc510ab47287 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-14 Jason Merrill <jason@redhat.com>
+
+ PR c++/37276
+ * decl.c (decls_match): Remove #ifdef around earlier fix.
+
2012-11-13 Jason Merrill <jason@redhat.com>
* class.c (finish_struct_1): Check virtual functions
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 115c567d6ddb..045e99b2080d 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -1017,13 +1017,11 @@ decls_match (tree newdecl, tree olddecl)
&& DECL_EXTERN_C_P (olddecl)))
return 0;
-#ifdef NO_IMPLICIT_EXTERN_C
/* A new declaration doesn't match a built-in one unless it
is also extern "C". */
if (DECL_IS_BUILTIN (olddecl)
&& DECL_EXTERN_C_P (olddecl) && !DECL_EXTERN_C_P (newdecl))
return 0;
-#endif
if (TREE_CODE (f1) != TREE_CODE (f2))
return 0;
--
GitLab