commit ea374096511f92206c264f3f1eb0551a05a34cd5
author Conley Owens <cco3@android.com> Fri Mar 09 15:13:14 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 09 15:13:14 2012 -0800
tree e6a46508fa4f7154b5615e99df8cfe9587c5fd80
parent 3557654c95bae7754dcd1951ec10742b895817e2
parent c24f5ba4ee2873d6fd980229f0d24c80104d3558

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

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