[gtk/listview-for-merge] win32: Don't define isnanf



commit 0b902c24ca9bb9c86125bad3221db46d17499739
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat May 30 14:57:56 2020 -0400

    win32: Don't define isnanf
    
    It seems to be present already, and we get
    warnings in ci with -Wshadow.

 config.h.meson     |  4 ----
 gtk/fallback-c89.c | 12 ------------
 meson.build        |  1 -
 3 files changed, 17 deletions(-)
---
diff --git a/config.h.meson b/config.h.meson
index fac759a2a7..ea79d778ff 100644
--- a/config.h.meson
+++ b/config.h.meson
@@ -35,10 +35,6 @@
    */
 #mesondefine HAVE_DECL_ISNAN
 
-/* Define to 1 if you have the declaration of `isnanf', and to 0 if you don't.
-   */
-#mesondefine HAVE_DECL_ISNANF
-
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #mesondefine HAVE_DLFCN_H
 
diff --git a/gtk/fallback-c89.c b/gtk/fallback-c89.c
index a566e3423a..9f091dbcf7 100644
--- a/gtk/fallback-c89.c
+++ b/gtk/fallback-c89.c
@@ -92,18 +92,6 @@ isnan (double x)
 }
 #endif
 
-#ifndef HAVE_DECL_ISNANF
-/* it seems of the supported compilers only
- * MSVC does not have isnanf(), but it does
- * have _isnanf() which does the same as isnanf()
- */
-static inline gboolean
-isnanf (float x)
-{
-  return _isnanf (x);
-}
-#endif
-
 #ifndef INFINITY
 /* define INFINITY for compilers that lack support for it */
 # ifdef HUGE_VALF
diff --git a/meson.build b/meson.build
index 874fee25a8..912c0f8a95 100644
--- a/meson.build
+++ b/meson.build
@@ -213,7 +213,6 @@ endforeach
 
 cdata.set('HAVE_DECL_ISINF', cc.has_header_symbol('math.h', 'isinf'))
 cdata.set('HAVE_DECL_ISNAN', cc.has_header_symbol('math.h', 'isnan'))
-cdata.set('HAVE_DECL_ISNANF', cc.has_header_symbol('math.h', 'isnanf'))
 
 # Disable deprecation checks for all libraries we depend on on stable branches.
 # This is so newer versions of those libraries don't cause more warnings with


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]