From d7560cc9916b086bfe5d86459cc9f04033edd904 Mon Sep 17 00:00:00 2001 From: Bernd Schubert Date: Tue, 7 Feb 2023 23:06:42 +0100 Subject: Split config.h into private and public config This addresses https://github.com/libfuse/libfuse/issues/729 commit db35a37def14b72181f3630efeea0e0433103c41 introduced a public config.h (rename to fuse_config.h to avoid conflicts) that was installed with the package and included by libfuse users through fuse_common.h. Probablem is that this file does not have unique defines so that they are unique to libfuse - on including the file conflicts with libfuse users came up. In principle all defines could be prefixed, but then most of them are internal for libfuse compilation only. So this splits out publically required defines to a new file 'libfuse_config.h' and changes back to include of "fuse_config.h" only when HAVE_LIBFUSE_PRIVATE_CONFIG_H is defined. This also renames HAVE_LIBC_VERSIONED_SYMBOLS to LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS, as it actually better explains for libfuse users what that variable is for. --- lib/fuse_misc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/fuse_misc.h') diff --git a/lib/fuse_misc.h b/lib/fuse_misc.h index 37e3635..855edc3 100644 --- a/lib/fuse_misc.h +++ b/lib/fuse_misc.h @@ -15,7 +15,7 @@ Note: "@@" denotes the default symbol, "@" is binary a compat version. */ -#ifdef HAVE_LIBC_VERSIONED_SYMBOLS +#ifdef LIBFUSE_BUILT_WITH_VERSIONED_SYMBOLS # if HAVE_SYMVER_ATTRIBUTE # define FUSE_SYMVER(sym1, sym2) __attribute__ ((symver (sym2))) # else -- cgit v1.2.3