commit c98c8831388d206f3883767fda3e9c0e5b2e816b
author Conley Owens <cco3@android.com> Fri Mar 09 15:06:53 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 09 15:06:53 2012 -0800
tree 1a36262a2c596284f809ab217cc2f33f508fd2f3
parent 9045f8d6bf6f052b8fa0e34de2d703e8bff75a95
parent dc1696c890698d55aade9dbadf3148c2fac01cd0

am 67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo"

* commit '67cf093d86539d4f3db7e2a2b168c9a250c0a5b8':
  stagefright amrwbenc: Simplify the definition of static_vo

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

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)))