diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-27 11:11:56 -0800 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-02-27 11:11:57 -0800 |
| commit | 1a864db7723a7947b72d24e6008ba48341d0feff (patch) | |
| tree | 66d1e42ccf21faa240575e3c4e2aac89d20dfa9b /media/libstagefright/codecs | |
| parent | 77576ff487e227092cdaf09db163e21f1e07604a (diff) | |
| parent | 9f26d4c4d1e3b9de6c41f50b0be73fc6553cad1a (diff) | |
| download | frameworks_base-1a864db7723a7947b72d24e6008ba48341d0feff.zip frameworks_base-1a864db7723a7947b72d24e6008ba48341d0feff.tar.gz frameworks_base-1a864db7723a7947b72d24e6008ba48341d0feff.tar.bz2 | |
Merge "stagefright aacenc: Simplify the definition of __inline"
Diffstat (limited to 'media/libstagefright/codecs')
| -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 /* |