From dc27bc4b2cd4b95a0d7ba5dd34e3be63e1cc0c9d Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Thu, 23 Jun 2011 12:09:34 +0300 Subject: stagefright amrwbenc: Simplify the definition of static_vo For GCC, all of inline, __inline and __inline__ work fine. For MSVC, only __inline works. (__inline should also be accepted by RVCT.) Change-Id: Ifbb1c848b200a8c4080624a3d3bd8b6ee498edb2 --- media/libstagefright/codecs/amrwbenc/inc/basic_op.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'media') 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))) -- cgit v1.1