| commit | 8876725f05518e8170aedb81ab40dfe638eb656f | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Aug 23 15:54:01 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 23 15:54:01 2012 -0700 |
| tree | cd9d3141a84a975eebe70804a3bd20b938134227 | |
| parent | 7b827d04a5cab7d8c5573181de3eb4ea2d0e173a [diff] | |
| parent | 0254d57367432069256b623c6852da8b92626e79 [diff] |
am 0254d573: Merge "Fix multiple defined symbol errors" * commit '0254d57367432069256b623c6852da8b92626e79': Fix multiple defined symbol errors
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