Skip to content

F
fdk-aac
Commit bae4553d authored by Martin Storsjo's avatar Martin Storsjo
Browse files
Options

Merge remote-tracking branch 'aosp/master'

parents 8f9f42c1 dd68dcdb
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
libSYS/include/genericStds.h
View file @ bae4553d
...@@ -96,9 +96,6 @@ amm-info@iis.fraunhofer.de ...@@ -96,9 +96,6 @@ amm-info@iis.fraunhofer.de
#include "machine_type.h" #include "machine_type.h"
/* Work around for broken android toolchain: sys/types.h:137: error: 'uint64_t' does not name a type */
#define _SYS_TYPES_H_
/* Always increase verbosity of memory allocation in case of a debug built. DEBUG is defined globally in that case. */ /* Always increase verbosity of memory allocation in case of a debug built. DEBUG is defined globally in that case. */
#if defined(DEBUG) || defined(FDK_DEBUG) #if defined(DEBUG) || defined(FDK_DEBUG)
......
libSYS/src/cmdl_parser.cpp
View file @ bae4553d
...@@ -92,9 +92,6 @@ amm-info@iis.fraunhofer.de ...@@ -92,9 +92,6 @@ amm-info@iis.fraunhofer.de
#define _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS
/* Work around for broken android toolchain: sys/types.h:137: error: 'uint64_t' does not name a type */
#define _SYS_TYPES_H_
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment