Skip to content

Commit 68ecb32

Browse files
Jean-Baptiste Queruandroid code review
authored andcommitted
Merge "stagefright aacenc: Move system headers before local headers"
2 parents 19703b1 + 8606e6b commit 68ecb32

File tree

1 file changed

+4
-1
lines changed
  • media/libstagefright/codecs/aacenc/src

1 file changed

+4
-1
lines changed

media/libstagefright/codecs/aacenc/src/adj_thr.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,16 @@
2020
2121
*******************************************************************************/
2222

23+
/* Include system headers before local headers - the local headers
24+
* redefine __inline, which can mess up definitions in libc headers if
25+
* they happen to use __inline. */
26+
#include <string.h>
2327
#include "basic_op.h"
2428
#include "oper_32b.h"
2529
#include "adj_thr_data.h"
2630
#include "adj_thr.h"
2731
#include "qc_data.h"
2832
#include "line_pe.h"
29-
#include <string.h>
3033

3134

3235
#define minSnrLimit 0x6666 /* 1 dB */

0 commit comments

Comments
 (0)