aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnatol Pomozov <anatol.pomozov@gmail.com>2012-01-06 10:55:52 -0800
committerMiklos Szeredi <mszeredi@suse.cz>2012-01-13 13:43:05 +0100
commit66003c26313ee099ed6ccac35a10b0cbfbc7eb0d (patch)
tree8ccdc55dc03297e2bec8c7a0e2fbac14ecf5dbf6
parent6c4cc1e64d9fee2fc7e38c0afa36f82b25dca69c (diff)
downloadandroid_external_fuse-66003c26313ee099ed6ccac35a10b0cbfbc7eb0d.tar.gz
android_external_fuse-66003c26313ee099ed6ccac35a10b0cbfbc7eb0d.tar.bz2
android_external_fuse-66003c26313ee099ed6ccac35a10b0cbfbc7eb0d.zip
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).
-rw-r--r--ChangeLog4
-rw-r--r--lib/fuse_misc.h8
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0cda4f8..fdedb6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-13 Miklos Szeredi <miklos@szeredi.hu>
+
+ * Disable symbol versions on MacOSX. Patch by Anatol Pomozov
+
2012-01-02 Miklos Szeredi <miklos@szeredi.hu>
* 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 <pthread.h>
-/* 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)