luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-11-04 01:58:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

meson: define G_PID_FORMAT

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=784995
This commit is contained in:
Christoph Reiter
2017-07-17 18:33:42 +02:00
committed by Christoph Reiter
parent d88d1ba7e8
commit ab6e425574
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
glib/glibconfig.h.in
View File

@@ -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@

4
meson.build
View File

@@ -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