am 4f74be5: am 1a864db: Merge "stagefright aacenc: Simplify the definition of __inline"

Jean-Baptiste Queru · Android Git Automerger · commit a887ff9ae61f · 2012-02-27T13:09:57.000-08:00
* commit '4f74be57e72cb2fbee05184f5bc00e716d0b95b3':
  stagefright aacenc: Simplify the definition of __inline
diff --git a/media/libstagefright/codecs/aacenc/basic_op/typedefs.h b/media/libstagefright/codecs/aacenc/basic_op/typedefs.h
@@ -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
 /*
