>From a72d7017053394f1603bdb2cf6b605e61eaa800a Mon Sep 17 00:00:00 2001
From: Paul Eggert <address@hidden>
Date: Sat, 20 Feb 2016 07:52:53 -0800
Subject: [PATCH] signbit: port back to pre-C++11 GCC

* lib/math.in.h (signbit): Do previous change only if
__cplusplus < 201103.  See Jonathan Wakely in:
https://lists.fedoraproject.org/archives/list/address@hidden/message/UY3VX3W7XEXYTUKHG5BALU4ACUD7ZLGE/
---
 ChangeLog     | 7 +++++++
 lib/math.in.h | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 7e06adf..8634579 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-02-20  Paul Eggert  <address@hidden>
+
+	signbit: port back to pre-C++11 GCC
+	* lib/math.in.h (signbit): Do previous change only if
+	__cplusplus < 201103.  See Jonathan Wakely in:
+	https://lists.fedoraproject.org/archives/list/address@hidden/message/UY3VX3W7XEXYTUKHG5BALU4ACUD7ZLGE/
+
 2016-02-19  Kamil Dudka  <address@hidden>
 
 	mountlist: recognize autofs-mounted remote file systems, too
diff --git a/lib/math.in.h b/lib/math.in.h
index afb080c..e3fd994 100644
--- a/lib/math.in.h
+++ b/lib/math.in.h
@@ -2205,7 +2205,8 @@ _GL_WARN_REAL_FLOATING_DECL (isnan);
 
 
 #if @GNULIB_SIGNBIT@
-# if @REPLACE_SIGNBIT_USING_GCC@ && !defined __cplusplus
+# if (@REPLACE_SIGNBIT_USING_GCC@ \
+      && (!defined __cplusplus || __cplusplus < 201103))
 #  undef signbit
    /* GCC 4.0 and newer provides three built-ins for signbit.  */
 #  define signbit(x) \
-- 
2.5.0