From 6e2ad3c4bab5e23d202ffcb171c49a9caeab8323 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Fri, 21 Jun 2024 16:18:28 +0200 Subject: [PATCH] Define HAVE_VISIBILITY for fileinfo extension (#14618) The libmagic library also uses the HAVE_VISIBILITY macro that should be defined to 1 if visibility is supported or 0 if not. Follow-up of GH-5526 (-Wundef) --- ext/fileinfo/config.m4 | 2 ++ ext/fileinfo/libmagic/config.h | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4 index a38a205822e..fa6c4d116be 100644 --- a/ext/fileinfo/config.m4 +++ b/ext/fileinfo/config.m4 @@ -21,6 +21,8 @@ if test "$PHP_FILEINFO" != "no"; then libmagic_sources="$libmagic_sources libmagic/strcasestr.c" ]) + AX_GCC_FUNC_ATTRIBUTE([visibility]) + PHP_NEW_EXTENSION(fileinfo, fileinfo.c php_libmagic.c $libmagic_sources, $ext_shared,,-I@ext_srcdir@/libmagic) PHP_ADD_BUILD_DIR($ext_builddir/libmagic) diff --git a/ext/fileinfo/libmagic/config.h b/ext/fileinfo/libmagic/config.h index 5acdf168730..4af6e06c412 100644 --- a/ext/fileinfo/libmagic/config.h +++ b/ext/fileinfo/libmagic/config.h @@ -8,3 +8,11 @@ #ifndef HAVE_STDINT_H #define HAVE_STDINT_H 1 #endif + +#ifndef HAVE_VISIBILITY +# ifdef HAVE_FUNC_ATTRIBUTE_VISIBILITY +# define HAVE_VISIBILITY 1 +# else +# define HAVE_VISIBILITY 0 +# endif +#endif