summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2011-04-05 17:35:18 +0300
committerMartin Storsjo <martin@martin.st>2012-01-13 20:56:33 +0200
commit9f26d4c4d1e3b9de6c41f50b0be73fc6553cad1a (patch)
tree6a4afcff1fd4493f356803173260be73ac4bdd4c /media/libstagefright/codecs
parentb4cee0f871e0f5a2abd6c6f05b65710b69423f2c (diff)
downloadframeworks_base-9f26d4c4d1e3b9de6c41f50b0be73fc6553cad1a.zip
frameworks_base-9f26d4c4d1e3b9de6c41f50b0be73fc6553cad1a.tar.gz
frameworks_base-9f26d4c4d1e3b9de6c41f50b0be73fc6553cad1a.tar.bz2
stagefright aacenc: Simplify the definition of __inline
This reduces the amount of ifdefs needed, into something that works on both gcc and MSVC. This removes one occurrance of the LINUX ifdef, simplifying compiling on various platforms. Change-Id: I1e2af6c2517410dc280197ba922df877cf7afbd5
Diffstat (limited to 'media/libstagefright/codecs')
-rw-r--r--media/libstagefright/codecs/aacenc/basic_op/typedefs.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/media/libstagefright/codecs/aacenc/basic_op/typedefs.h b/media/libstagefright/codecs/aacenc/basic_op/typedefs.h
index c924e2c..76eb8f1 100644
--- a/media/libstagefright/codecs/aacenc/basic_op/typedefs.h
+++ b/media/libstagefright/codecs/aacenc/basic_op/typedefs.h
@@ -48,9 +48,7 @@
#define assert(_Expression) ((void)0)
#endif
-#ifdef LINUX
-#define __inline static __inline__
-#endif
+#define __inline static __inline
#define INT_BITS 32
/*