diff options
author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2018-06-08 17:01:42 +0800 |
---|---|---|
committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2018-06-08 17:12:30 +0800 |
commit | 84da85139a88b7280f6217f6154f9a95aba916c5 (patch) | |
tree | 69328884f369845aca425863bf2bbfb527ba2ee2 | |
parent | 5ec6746e86faa3ebdebd170e8edcc70978868556 (diff) | |
download | gdk-pixbuf-84da85139a88b7280f6217f6154f9a95aba916c5.tar.gz |
meson.build Use set() instead of set10()
Fix the checks as set10() will still set the macros to 0, which will
break the build when we compile conditionally using #if[n]def.
-rw-r--r-- | meson.build | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meson.build b/meson.build index a989b4069..3c656d430 100644 --- a/meson.build +++ b/meson.build @@ -94,7 +94,7 @@ if cc.has_function('setrlimit', prefix: '#include <sys/time.h>\n#include <sys/re endif # We use links() because sigsetjmp() is often a macro hidden behind other macros -gdk_pixbuf_conf.set10('HAVE_SIGSETJMP', +gdk_pixbuf_conf.set('HAVE_SIGSETJMP', cc.links('''#define _POSIX_SOURCE #include <setjmp.h> int main (void) { @@ -218,7 +218,7 @@ gdk_pixbuf_deps = [ mathlib_dep, gobject_dep, gmodule_dep, gio_dep, shared_mime_ # Check if we can build shared modules build_modules = gmodule_dep.get_pkgconfig_variable('gmodule_supported') == 'true' -gdk_pixbuf_conf.set10('USE_GMODULE', build_modules) +gdk_pixbuf_conf.set('USE_GMODULE', build_modules) # Check which loaders should be built into gdk-pixbuf builtin_loaders = get_option('builtin_loaders').split(',') @@ -304,9 +304,9 @@ if get_option('jpeg') and not native_windows_loaders enabled_loaders += 'jpeg' loaders_deps += jpeg_dep - gdk_pixbuf_conf.set10('HAVE_PROGRESSIVE_JPEG', - cc.has_function('jpeg_simple_progression', - dependencies: jpeg_dep)) + gdk_pixbuf_conf.set('HAVE_PROGRESSIVE_JPEG', + cc.has_function('jpeg_simple_progression', + dependencies: jpeg_dep)) endif endif endif |