From e8d3d885b1362caba4f1e1dfa42d45bac7163124 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Fri, 16 Mar 2018 17:07:08 +0000 Subject: [PATCH] meson,configure: always define HAVE_VISIBILITY Signed-off-by: Eric Engestrom Reviewed-by: Emil Velikov Reviewed-by: Dylan Baker --- configure.ac | 2 ++ libdrm_macros.h | 2 +- meson.build | 7 +++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 762ca9f9..607d8597 100644 --- a/configure.ac +++ b/configure.ac @@ -535,6 +535,8 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([ if test "x$HAVE_ATTRIBUTE_VISIBILITY" = xyes; then AC_DEFINE(HAVE_VISIBILITY, 1, [Compiler supports __attribute__(("hidden"))]) +else + AC_DEFINE(HAVE_VISIBILITY, 0) fi AC_SUBST(WARN_CFLAGS) diff --git a/libdrm_macros.h b/libdrm_macros.h index 639d0904..211fab21 100644 --- a/libdrm_macros.h +++ b/libdrm_macros.h @@ -23,7 +23,7 @@ #ifndef LIBDRM_LIBDRM_H #define LIBDRM_LIBDRM_H -#if defined(HAVE_VISIBILITY) +#if HAVE_VISIBILITY # define drm_private __attribute__((visibility("hidden"))) #else # define drm_private diff --git a/meson.build b/meson.build index 50daa1d0..826cd915 100644 --- a/meson.build +++ b/meson.build @@ -256,10 +256,9 @@ with_man_pages = with_man_pages != 'false' and prog_xslt.found() and prog_sed.fo # Used for tets prog_bash = find_program('bash') -if cc.compiles('''int foo_hidden(void) __attribute__((visibility(("hidden"))));''', - name : 'compiler supports __attribute__(("hidden"))') - config.set10('HAVE_VISIBILITY', true) -endif +config.set10('HAVE_VISIBILITY', + cc.compiles('''int foo_hidden(void) __attribute__((visibility(("hidden"))));''', + name : 'compiler supports __attribute__(("hidden"))')) foreach t : [ [with_exynos, 'EXYNOS'],