diff options
| author | Martin Storsjo <martin@martin.st> | 2012-09-05 11:32:25 +0300 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2012-09-05 11:32:25 +0300 |
| commit | 50b1de17ac25b03827a80754eb3b7ac24478d03c (patch) | |
| tree | f89b17176fc40a25b21422d263d6413b7eddec5e /libSYS | |
| parent | 8e4d5d9d2fb16e29e4b30a1ae867ab269b1781b3 (diff) | |
| parent | fef220869b4e5bf9241369d3379b389136c2f174 (diff) | |
| download | ODR-AudioEnc-50b1de17ac25b03827a80754eb3b7ac24478d03c.tar.gz ODR-AudioEnc-50b1de17ac25b03827a80754eb3b7ac24478d03c.tar.bz2 ODR-AudioEnc-50b1de17ac25b03827a80754eb3b7ac24478d03c.zip | |
Merge remote-tracking branch 'aosp/master'
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> |