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 | 7c7674ea2d7ba099b5afd3badf4d69da55b377dd (patch) | |
| tree | 9a16d9c3f8ccc318f47cae74be34bbf2078dcd25 /media/libstagefright/codecs/aacenc/basic_op/typedefs.h | |
| parent | e98a953903240da9e5118594b6e4f454dcd2c123 (diff) | |
| parent | 32bc0329ac94b181f1457c182c5bb2903f29832d (diff) | |
| download | frameworks_av-7c7674ea2d7ba099b5afd3badf4d69da55b377dd.zip frameworks_av-7c7674ea2d7ba099b5afd3badf4d69da55b377dd.tar.gz frameworks_av-7c7674ea2d7ba099b5afd3badf4d69da55b377dd.tar.bz2 | |
Merge "stagefright aacenc: Simplify the definition of __inline"
Diffstat (limited to 'media/libstagefright/codecs/aacenc/basic_op/typedefs.h')
| -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 /* |