gettimeofday: port recent C++ fix to Emacs

[gnulib.git] / lib / signbitd.c

diff --git a/lib/signbitd.c b/lib/signbitd.c
index 3c06ebd..7a434f8 100644 (file)
--- a/lib/signbitd.c
+++ b/lib/signbitd.c
@@ -1,19 +1,18 @@
 /* signbit() macro: Determine the sign bit of a floating-point number.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2013 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
@@ -21,10 +20,12 @@
 #include <math.h>
 
 #include <string.h>
-#include "isnan.h"
+#include "isnand-nolibm.h"
 #include "float+.h"
 
-#undef gl_signbitd
+#ifdef gl_signbitd_OPTIMIZED_MACRO
+# undef gl_signbitd
+#endif
 
 int
 gl_signbitd (double arg)
@@ -46,7 +47,7 @@ gl_signbitd (double arg)
 #else
   /* This does not do the right thing for NaN, but this is irrelevant for
      most use cases.  */
-  if (isnan (arg))
+  if (isnand (arg))
     return 0;
   if (arg < 0.0)
     return 1;