From: Anatol Pomozov Date: Fri, 6 Jan 2012 18:55:52 +0000 (-0800) Subject: Disable symbol versions on MacOSX X-Git-Tag: fuse_2_9_0~12 X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=66003c26313ee099ed6ccac35a10b0cbfbc7eb0d;p=qemu-gpiodev%2Flibfuse.git Disable symbol versions on MacOSX MacOSX uses MachO binary format that does not support symbols. This change comes from fuse4x project (fuse implementation for macosx). --- diff --git a/ChangeLog b/ChangeLog index 0cda4f8..fdedb6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-01-13 Miklos Szeredi + + * Disable symbol versions on MacOSX. Patch by Anatol Pomozov + 2012-01-02 Miklos Szeredi * Remove unnecessary mutex unlock at the end of multithreaded diff --git a/lib/fuse_misc.h b/lib/fuse_misc.h index c2cfee1..eedf0e0 100644 --- a/lib/fuse_misc.h +++ b/lib/fuse_misc.h @@ -9,8 +9,12 @@ #include "config.h" #include -/* Versioned symbols confuse the dynamic linker in uClibc */ -#ifndef __UCLIBC__ +/* + Versioned symbols cannot be used in some cases because it + - confuse the dynamic linker in uClibc + - not supported on MacOSX (in MachO binary format) +*/ +#if (!defined(__UCLIBC__) && !defined(__APPLE__)) #define FUSE_SYMVER(x) __asm__(x) #else #define FUSE_SYMVER(x)