| commit | 0254d57367432069256b623c6852da8b92626e79 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Aug 23 08:04:03 2012 -0700 |
| committer | android code review <noreply-gerritcodereview@google.com> | Thu Aug 23 08:04:04 2012 -0700 |
| tree | 888ac0b9acdbc706e6ef40d4806a5ae19d779e78 | |
| parent | 481e03e39810ba1b7eab1d0d806039f45c4ad987 [diff] | |
| parent | 0298ec21d2f895f03fcce2377f64ab4cb88bca8a [diff] |
Merge "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