Merge branch '324.c89' into 'gtk-3-24'

Fix gtk-3-24 builds on older C89-esque compilers

See merge request !2995

config.h.meson

@@ -44,6 +44,9 @@
 /* Define to 1 if you have the `flockfile' function. */
 #mesondefine HAVE_FLOCKFILE
 
+/* Define to 1 if you have the `fmin' function. */
+#mesondefine HAVE_FMIN
+
 /* Define to 1 if you have the <ftw.h> header file. */
 #mesondefine HAVE_FTW_H
 

config.h.win32.in

@@ -52,6 +52,11 @@
 /* Define to 1 if you have the `flockfile' function. */
 #undef HAVE_FLOCKFILE
 
+/* Define to 1 if you have the `fmin' function. */
+#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
+# define HAVE_FMIN 1
+#endif
+
 /* Define to 1 if you have the <ftw.h> header file. */
 /* #undef HAVE_FTW_H */
 

configure.ac

@@ -843,7 +843,7 @@ AC_TYPE_UID_T
 # Check for round(), rint(), isnan() and isinf()
 # Check for log2(), exp2(), nearbyint() and trunc()
 AC_CHECK_LIB(m,round,,)
-AC_CHECK_FUNCS(round rint nearbyint sincos exp2 log2 trunc)
+AC_CHECK_FUNCS(round rint nearbyint sincos exp2 log2 trunc fmin)
 AC_CHECK_DECLS([isnan, isinf], [], [], [[#include <math.h>]])
 
 AC_MSG_CHECKING(whether to build dynamic modules)

gtk/fallback-c89.c

@@ -126,3 +126,11 @@ isnan (double x)
   return _isnan (x);
 }
 #endif
+
+#ifndef HAVE_FMIN
+static inline double
+fmin (double x, double y)
+{
+  return x < y ? x : y;
+}
+#endif

gtk/gtkscrolledwindow.c

@@ -48,7 +48,7 @@
 #include "gtkprogresstrackerprivate.h"
 #include "gtksettingsprivate.h"
 
-#include <math.h>
+#include "fallback-c89.c"
 
 /**
  * SECTION:gtkscrolledwindow
@@ -3754,10 +3754,11 @@ kinetic_scroll_stop_notify (GtkScrolledWindow *scrolled_window)
 static void
 gtk_scrolled_window_accumulate_velocity (GtkKineticScrolling **scrolling, double elapsed, double *velocity)
 {
+    double last_velocity;
+
     if (!*scrolling)
       return;
 
-    double last_velocity;
     gtk_kinetic_scrolling_tick (*scrolling, elapsed, NULL, &last_velocity);
     if (((*velocity >= 0) == (last_velocity >= 0)) &&
         (fabs (*velocity) >= fabs (last_velocity) * VELOCITY_ACCUMULATION_FLOOR))

meson.build

@@ -252,6 +252,7 @@ check_functions = [
   'sincos',
   'trunc',
   'localtime_r',
+  'fmin',
 ]
 
 foreach func : check_functions