diff options
| author | 2012-03-09 15:13:14 -0800 | |
|---|---|---|
| committer | 2012-03-09 15:13:14 -0800 | |
| commit | ea374096511f92206c264f3f1eb0551a05a34cd5 (patch) | |
| tree | e6a46508fa4f7154b5615e99df8cfe9587c5fd80 | |
| parent | 3557654c95bae7754dcd1951ec10742b895817e2 (diff) | |
| parent | c24f5ba4ee2873d6fd980229f0d24c80104d3558 (diff) | |
am c24f5ba4: am 9a3f3b9d: am 67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo"
* commit 'c24f5ba4ee2873d6fd980229f0d24c80104d3558':
stagefright amrwbenc: Simplify the definition of static_vo
| -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 c23dce6fb1a2..f42a27cf8b69 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))) |