Skip to content

Commit 9a3f3b9

Browse files
cco3Android Git Automerger
authored andcommitted
am 67cf093: Merge "stagefright amrwbenc: Simplify the definition of static_vo"
* commit '67cf093d86539d4f3db7e2a2b168c9a250c0a5b8': stagefright amrwbenc: Simplify the definition of static_vo
2 parents 972efaf + 67cf093 commit 9a3f3b9

File tree

1 file changed

+0
-4
lines changed
  • media/libstagefright/codecs/amrwbenc/inc

1 file changed

+0
-4
lines changed

media/libstagefright/codecs/amrwbenc/inc/basic_op.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,7 @@
2929
#define MIN_16 (Word16)-32768 /* 0x8000 */
3030

3131

32-
#ifdef LINUX
33-
#define static_vo static __inline__
34-
#else
3532
#define static_vo static __inline
36-
#endif
3733

3834
#define saturate(L_var1) (((L_var1) > 0X00007fffL) ? (MAX_16): (((L_var1) < (Word32) 0xffff8000L) ? (MIN_16): ((L_var1) & 0xffff)))
3935

0 commit comments

Comments
 (0)