diff options
| author | Martin Storsjo <martin@martin.st> | 2013-02-27 22:06:16 +0200 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2013-02-27 22:06:16 +0200 |
| commit | bae4553d428accc6438102578ffd9e7968333b94 (patch) | |
| tree | c062f639e8451c37afb0ff137e8e179e8b118097 | |
| parent | 8f9f42c1041e877c602e0acd43361d7068c3ce1c (diff) | |
| parent | dd68dcdb756966b80ad86268d7fe45b3434374c9 (diff) | |
| download | fdk-aac-bae4553d428accc6438102578ffd9e7968333b94.tar.gz fdk-aac-bae4553d428accc6438102578ffd9e7968333b94.tar.bz2 fdk-aac-bae4553d428accc6438102578ffd9e7968333b94.zip | |
Merge remote-tracking branch 'aosp/master'
| -rw-r--r-- | libSYS/include/genericStds.h | 3 | ||||
| -rw-r--r-- | libSYS/src/cmdl_parser.cpp | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/libSYS/include/genericStds.h b/libSYS/include/genericStds.h index 2d6eea6..6adf689 100644 --- a/libSYS/include/genericStds.h +++ b/libSYS/include/genericStds.h @@ -96,9 +96,6 @@ amm-info@iis.fraunhofer.de #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. */ #if defined(DEBUG) || defined(FDK_DEBUG) diff --git a/libSYS/src/cmdl_parser.cpp b/libSYS/src/cmdl_parser.cpp index a93a2f4..bf020ee 100644 --- a/libSYS/src/cmdl_parser.cpp +++ b/libSYS/src/cmdl_parser.cpp @@ -92,9 +92,6 @@ amm-info@iis.fraunhofer.de #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 <stdio.h> #include <string.h> |