diff options
| author | Martin Storsjo <martin@martin.st> | 2011-06-23 12:09:34 +0300 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2012-01-30 13:03:01 +0200 |
| commit | dc27bc4b2cd4b95a0d7ba5dd34e3be63e1cc0c9d (patch) | |
| tree | bf7f05bd8bdafa3d15579791ef35f15a4d5d039a | |
| parent | 013b73bfc4d5fb21082ccccf45fa08c18f86aa08 (diff) | |
| download | frameworks_av-dc27bc4b2cd4b95a0d7ba5dd34e3be63e1cc0c9d.zip frameworks_av-dc27bc4b2cd4b95a0d7ba5dd34e3be63e1cc0c9d.tar.gz frameworks_av-dc27bc4b2cd4b95a0d7ba5dd34e3be63e1cc0c9d.tar.bz2 | |
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
| -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))) |