diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-07-24 21:13:17 +0100 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-07-24 21:13:17 +0100 |
| commit | a3f948498bb64c94bf53dd9ed0617e1b4d02e1e5 (patch) | |
| tree | ba1cf9ed5c44ad80aa47935877bc860ee77e6135 | |
| parent | b2511c6a79ea8d029b2b9d19130fd41d9838546f (diff) | |
| parent | dd68dcdb756966b80ad86268d7fe45b3434374c9 (diff) | |
| download | android_external_aac-a3f948498bb64c94bf53dd9ed0617e1b4d02e1e5.tar.gz android_external_aac-a3f948498bb64c94bf53dd9ed0617e1b4d02e1e5.tar.bz2 android_external_aac-a3f948498bb64c94bf53dd9ed0617e1b4d02e1e5.zip | |
Merge tag 'android-4.3_r2.1' into cm-10.2cm-10.2.1cm-10.2.0cm-10.2-M1stable/cm-10.2cm-10.2
Android 4.3 release 2.1
| -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> |