Commit 43a1734e authored Feb 27, 2012 by Jean-Baptiste Queru Committed by Android Git Automerger Feb 27, 2012

am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline"

* commit '1a864db7723a7947b72d24e6008ba48341d0feff':
  stagefright aacenc: Simplify the definition of __inline

media/libstagefright/codecs/aacenc/basic_op/typedefs.h

+1 −3

Original line number	Diff line number	Diff line
		@@ -48,9 +48,7 @@
		#define assert(_Expression) ((void)0)
		#endif

		#ifdef LINUX
		#define __inline static __inline__
		#endif
		#define __inline static __inline

		#define INT_BITS 32
		/*