[libdrm,2/4] meson,configure: always define HAVE_VISIBILITY

Commit Message

Eric Engestrom March 16, 2018, 5:12 p.m. UTC

Signed-off-by: Eric Engestrom <[e-mail]>
---
 configure.ac    | 2 ++
 libdrm_macros.h | 2 +-
 meson.build     | 7 +++----
 3 files changed, 6 insertions(+), 5 deletions(-)

Patch

diff --git a/configure.ac b/configure.ac
index 5751a8113635ce6a1c48..14baa1c87f9078f336fa 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
 
 CFLAGS="$CFLAGS -include config.h"
diff --git a/libdrm_macros.h b/libdrm_macros.h
index 639d09047efcd5619ae3..211fab21986f55745ad9 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 f7986af9bb5259be5da5..8d4d38b46ebcf75b9fb6 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'],