diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-09-04 13:13:43 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-09-04 13:13:44 -0700 |
| commit | fef220869b4e5bf9241369d3379b389136c2f174 (patch) | |
| tree | d17702b959201fe2945accb3516c7c929d8052f6 /libSYS | |
| parent | ee36153b8ca239749174996f44bd07737aeace53 (diff) | |
| parent | ad749575b4520b2a6f946d54647b0b2bca945b42 (diff) | |
| download | fdk-aac-fef220869b4e5bf9241369d3379b389136c2f174.tar.gz fdk-aac-fef220869b4e5bf9241369d3379b389136c2f174.tar.bz2 fdk-aac-fef220869b4e5bf9241369d3379b389136c2f174.zip | |
Merge "Remove workaround in aac for broken toolchain"
Diffstat (limited to 'libSYS')
| -rw-r--r-- | libSYS/include/genericStds.h | 2 | ||||
| -rw-r--r-- | libSYS/src/cmdl_parser.cpp | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/libSYS/include/genericStds.h b/libSYS/include/genericStds.h index 2d6eea6..756935b 100644 --- a/libSYS/include/genericStds.h +++ b/libSYS/include/genericStds.h @@ -96,8 +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. */ 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> |