diff options
| author | Conley Owens <cco3@android.com> | 2012-03-09 15:06:53 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-09 15:06:53 -0800 |
| commit | 9a3f3b9db63e7e109a417c0959b8bc589ab70e04 (patch) | |
| tree | b642f582da35b28e92c9099a67ac77c4ef4943c9 /media | |
| parent | 972efafb90b543eea51aa5b23104d469a1bcc1fb (diff) | |
| parent | 67cf093d86539d4f3db7e2a2b168c9a250c0a5b8 (diff) | |
| download | frameworks_base-9a3f3b9db63e7e109a417c0959b8bc589ab70e04.zip frameworks_base-9a3f3b9db63e7e109a417c0959b8bc589ab70e04.tar.gz frameworks_base-9a3f3b9db63e7e109a417c0959b8bc589ab70e04.tar.bz2 | |
am 67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo"
* commit '67cf093d86539d4f3db7e2a2b168c9a250c0a5b8':
stagefright amrwbenc: Simplify the definition of static_vo
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/codecs/amrwbenc/inc/basic_op.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/media/libstagefright/codecs/amrwbenc/inc/basic_op.h b/media/libstagefright/codecs/amrwbenc/inc/basic_op.h index c23dce6..f42a27c 100644 --- a/media/libstagefright/codecs/amrwbenc/inc/basic_op.h +++ b/media/libstagefright/codecs/amrwbenc/inc/basic_op.h @@ -29,11 +29,7 @@ #define MIN_16 (Word16)-32768 /* 0x8000 */ -#ifdef LINUX -#define static_vo static __inline__ -#else #define static_vo static __inline -#endif #define saturate(L_var1) (((L_var1) > 0X00007fffL) ? (MAX_16): (((L_var1) < (Word32) 0xffff8000L) ? (MIN_16): ((L_var1) & 0xffff))) |