diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-27 13:15:03 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-27 13:15:03 -0800 |
| commit | d7fe790fe59089394ee01f5d56106c0f488aad0a (patch) | |
| tree | b4a05095970cd2b0b0c19055ac7943fed8ea9e65 /media/libstagefright/codecs/aacenc | |
| parent | bf9fc69dd171c99794725171c38f65a3c6f6e544 (diff) | |
| parent | 43a1734eba6f409f9982d2e35dde6a869dbbdc90 (diff) | |
| download | frameworks_av-d7fe790fe59089394ee01f5d56106c0f488aad0a.zip frameworks_av-d7fe790fe59089394ee01f5d56106c0f488aad0a.tar.gz frameworks_av-d7fe790fe59089394ee01f5d56106c0f488aad0a.tar.bz2 | |
am 18a64b74: am a887ff9a: am 4f74be57: am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline"
* commit '18a64b74aa3cb0babb5f50e5f80660f601d80123':
stagefright aacenc: Simplify the definition of __inline
Diffstat (limited to 'media/libstagefright/codecs/aacenc')
| -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 2d5d956..8ef43e2 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 /* |