diff options
| author | 2012-02-27 13:09:57 -0800 | |
|---|---|---|
| committer | 2012-02-27 13:09:57 -0800 | |
| commit | a887ff9ae61f6cb925feb6e08643716ac28e35db (patch) | |
| tree | b0e18018987ad762d8a0f29ddc506a5ab818b2f1 | |
| parent | f7210cf55cafef55cca8cca65e1749b1dd088e77 (diff) | |
| parent | 4f74be57e72cb2fbee05184f5bc00e716d0b95b3 (diff) | |
am 4f74be57: am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline"
* commit '4f74be57e72cb2fbee05184f5bc00e716d0b95b3':
stagefright aacenc: Simplify the definition of __inline
| -rw-r--r-- | media/libstagefright/codecs/aacenc/basic_op/typedefs.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/media/libstagefright/codecs/aacenc/basic_op/typedefs.h b/media/libstagefright/codecs/aacenc/basic_op/typedefs.h index 2d5d9567f2db..8ef43e265aa5 100644 --- 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 /* |