Commit 8876725f authored Aug 23, 2012 by Jean-Baptiste Queru Committed by Android Git Automerger Aug 23, 2012

am 0254d573: Merge "Fix multiple defined symbol errors"

* commit '0254d573':
  Fix multiple defined symbol errors

minzip/inline_magic.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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