From ab6e425574ce2f6aeaeddeee82cbbe7d1bbdd8d4 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Mon, 17 Jul 2017 18:33:42 +0200
Subject: [PATCH] meson: define G_PID_FORMAT

https://bugzilla.gnome.org/show_bug.cgi?id=784995
---
 glib/glibconfig.h.in | 1 +
 meson.build          | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/glib/glibconfig.h.in b/glib/glibconfig.h.in
index 87a4a12de..e9fc6c6d2 100644
--- a/glib/glibconfig.h.in
+++ b/glib/glibconfig.h.in
@@ -191,6 +191,7 @@ typedef unsigned @glib_intptr_type_define@ guintptr;
 #define G_MODULE_SUFFIX "@g_module_suffix@"
 
 typedef @g_pid_type@ GPid;
+#define G_PID_FORMAT @g_pid_format@
 
 #define GLIB_SYSDEF_AF_UNIX @g_af_unix@
 #define GLIB_SYSDEF_AF_INET @g_af_inet@
diff --git a/meson.build b/meson.build
index 99afed062..1f294312e 100644
--- a/meson.build
+++ b/meson.build
@@ -925,7 +925,7 @@ glib_conf.set('ALIGNOF_GUINT64', guint64_align)
 
 if host_system == 'windows'
   glibconfig_conf.set('g_pid_type', 'void*')
-  glibconfig_conf.set('G_PID_FORMAT', '"p"')
+  glibconfig_conf.set('g_pid_format', '"p"')
   if host_machine.cpu_family() == 'x86_64'
     glibconfig_conf.set('g_pollfd_format', '"%#I64x"')
   else
@@ -933,7 +933,7 @@ if host_system == 'windows'
   endif
 else
   glibconfig_conf.set('g_pid_type', 'int')
-  glibconfig_conf.set('G_PID_FORMAT', '"i"')
+  glibconfig_conf.set('g_pid_format', '"i"')
   glibconfig_conf.set('g_pollfd_format', '"%d"')
 endif