diff options
| author | Bernd Schubert <bschubert@ddn.com> | 2023-01-02 22:53:54 +0100 |
|---|---|---|
| committer | Nikolaus Rath <Nikolaus@rath.org> | 2023-01-04 15:27:21 +0000 |
| commit | 3736e0c85f4a8b624f6f1a27b736c18adbce9c15 (patch) | |
| tree | 76cfcc05c6a150b1a738649d05887fd581df68bc /lib | |
| parent | f212ec087037b5bb74700e6cce63c208bdbe8442 (diff) | |
| download | libfuse-3736e0c85f4a8b624f6f1a27b736c18adbce9c15.tar.gz | |
convert __APPLE__ and __ULIBC__ to HAVE_LIBC_VERSIONED_SYMBOLS
In fact only gnu-libc fully supports symbol versioning, so it is
better to have a generic macro for it. This also allows to manually
disable symbol version and allows to run tests with that
configuration on gnu-libc. That testing will still not catch compat
issues, but least ensures the code can compile.
Testing for __APPLE__ and __ULIBC__ is now done by meson. More of such
checks can be added by people using other libcs.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/compat.c | 2 | ||||
| -rw-r--r-- | lib/fuse_misc.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/compat.c b/lib/compat.c index bdff5c9..6d4dece 100644 --- a/lib/compat.c +++ b/lib/compat.c @@ -34,7 +34,7 @@ /** * Compatibility ABI symbol for systems that do not support version symboling */ -#if (defined(__UCLIBC__) || defined(__APPLE__)) +#if (!defined(HAVE_LIBC_VERSIONED_SYMBOLS)) /* With current libfuse fuse_parse_cmdline is a macro pointing to the * versioned function. Here in this file we need to provide the ABI symbol * and the redirecting macro is conflicting. diff --git a/lib/fuse_misc.h b/lib/fuse_misc.h index e2e9ba5..37e3635 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. */ -#ifndef __APPLE__ +#ifdef HAVE_LIBC_VERSIONED_SYMBOLS # if HAVE_SYMVER_ATTRIBUTE # define FUSE_SYMVER(sym1, sym2) __attribute__ ((symver (sym2))) # else |