summaryrefslogtreecommitdiffstats
path: root/minzip
diff options
context:
space:
mode:
authorEdwin Vane <edwin.vane@intel.com>2012-05-22 14:16:54 -0400
committerEdwin Vane <edwin.vane@intel.com>2012-08-21 16:04:21 -0400
commit0298ec21d2f895f03fcce2377f64ab4cb88bca8a (patch)
treea1392dd8fd185b004b6c1413a00e57ad6fac2896 /minzip
parent3733d2185bbcedd9ef626907f1f32628986cc0f5 (diff)
downloadbootable_recovery-0298ec21d2f895f03fcce2377f64ab4cb88bca8a.zip
bootable_recovery-0298ec21d2f895f03fcce2377f64ab4cb88bca8a.tar.gz
bootable_recovery-0298ec21d2f895f03fcce2377f64ab4cb88bca8a.tar.bz2
Fix multiple defined symbol errors
Use of __inline__ by projects in bootable/* was causing problems with clang. Following the BKM and replaced use of __inline__ with __attribute((__gnu_inline)). Change-Id: If4ccfded685bb2c9d9c23c9b92ee052208399ef0 Author: Edwin Vane <edwin.vane@intel.com> Reviewed-by: Kevin P Schoedel <kevin.p.schoedel@intel.com>
Diffstat (limited to 'minzip')
-rw-r--r--minzip/inline_magic.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/minzip/inline_magic.h b/minzip/inline_magic.h
index 8c185e1..59c659f 100644
--- a/minzip/inline_magic.h
+++ b/minzip/inline_magic.h
@@ -18,7 +18,7 @@
#define MINZIP_INLINE_MAGIC_H_
#ifndef MINZIP_GENERATE_INLINES
-#define INLINE extern __inline__
+#define INLINE extern inline __attribute((__gnu_inline__))
#else
#define INLINE
#endif