luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-12 20:36:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'solaris-defines' into 'master'

Browse Source 
Meson: Add missing defines on Solaris

See merge request GNOME/glib!64
This commit is contained in:
Philip Withnall 2018-06-06 01:55:43 +00:00
commit f06ba1722c
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meson.build
View File

@ -1775,11 +1775,17 @@ have_sh = find_program('sh', required : false).found() # For glib-gettextize
# FIXME: defines in config.h that are not actually used anywhere # FIXME: defines in config.h that are not actually used anywhere
# (we add them for now to minimise the diff) # (we add them for now to minimise the diff)
glib_conf.set('HAVE_DLFCN_H', 1) glib_conf.set('HAVE_DLFCN_H', 1)
glib_conf.set('__EXTENSIONS__', 1)
glib_conf.set('STDC_HEADERS', 1) glib_conf.set('STDC_HEADERS', 1)
# THREADS_NONE # THREADS_NONE
glib_conf.set('SIZEOF___INT64', 8) glib_conf.set('SIZEOF___INT64', 8)
# FIXME: How to detect Solaris? https://github.com/mesonbuild/meson/issues/1578
if host_system == 'sunos'
glib_conf.set('_XOPEN_SOURCE_EXTENDED', 1)
glib_conf.set('_XOPEN_SOURCE', 2)
glib_conf.set('__EXTENSIONS__',1)
endif
glib_conf.set('GIO_MODULE_DIR', glib_giomodulesdir) glib_conf.set('GIO_MODULE_DIR', glib_giomodulesdir)
# Sadly Meson does not expose this value: # Sadly Meson does not expose this value: