From 8606e6b4dacb30e1713ad40cbbea6fdaa74999ba Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Wed, 23 May 2012 15:01:54 +0300 Subject: [PATCH] stagefright aacenc: Move system headers before local headers This avoids issues with the encoder's own definition of __inline, which conflicts with headers brought in by string.h in glibc. Change-Id: I9e3fbf8d892529940ea67a46e67a9abe71d9c5fa --- media/libstagefright/codecs/aacenc/src/adj_thr.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/media/libstagefright/codecs/aacenc/src/adj_thr.c b/media/libstagefright/codecs/aacenc/src/adj_thr.c index 07b33b7ff8a4b..ccfe8833c082e 100644 --- a/media/libstagefright/codecs/aacenc/src/adj_thr.c +++ b/media/libstagefright/codecs/aacenc/src/adj_thr.c @@ -20,13 +20,16 @@ *******************************************************************************/ +/* Include system headers before local headers - the local headers + * redefine __inline, which can mess up definitions in libc headers if + * they happen to use __inline. */ +#include #include "basic_op.h" #include "oper_32b.h" #include "adj_thr_data.h" #include "adj_thr.h" #include "qc_data.h" #include "line_pe.h" -#include #define minSnrLimit 0x6666 /* 1 dB */