Merge branch 'master.msvc' into 'master'

Fix building recent GTK master on Visual Studio

See merge request GNOME/gtk!1369

demos/widget-factory/widget-factory.c

@@ -20,6 +20,8 @@
 
 #include "config.h"
 
+#include <stdlib.h>
+
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 

meson.build

@@ -223,9 +223,17 @@ endif
 if cc.get_id() == 'msvc'
   # Compiler options taken from msvc_recommended_pragmas.h
   # in GLib, based on _Win32_Programming_ by Rector and Newcomer
-  test_cflags = []
-  add_project_arguments('-FImsvc_recommended_pragmas.h', language: 'c')
-  add_project_arguments('-D_USE_MATH_DEFINES', language: 'c')
+  test_cflags = [
+    '-FImsvc_recommended_pragmas.h',
+	'-D_USE_MATH_DEFINES',
+	'-utf-8',
+  ]
+  add_project_arguments(cc.get_supported_arguments(test_cflags), language: 'c')
+
+  cxx = meson.get_compiler('cpp')
+  if cxx.get_id() == 'msvc'
+    add_project_arguments(cxx.get_supported_arguments(test_cflags), language: 'cpp')
+  endif
 elif cc.get_id() == 'gcc' or cc.get_id() == 'clang'
   test_cflags = [
     '-fno-strict-aliasing',

tests/testdnd2.c

@@ -1,6 +1,11 @@
-#include <unistd.h>
 #include <gtk/gtk.h>
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#elif defined (G_OS_WIN32)
+#include <io.h>
+#endif
+
 static GdkTexture *
 get_image_texture (GtkImage *image,
                    int      *out_size)