summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2012-11-29 19:32:14 -0800
committerGerrit Code Review <noreply-gerritcodereview@google.com>2012-11-29 19:32:14 -0800
commit0d439d3d744f5ac8b0b0c16dcc9d1d3814ad002e (patch)
tree7a7d816decc6c0056617405a07ed4ee36170c9cd
parent6ab36997af5d5acda4f21d33031f4e45c85f96b7 (diff)
parent1d24ddc612489f57c23e78a5deaaad91f1bf6ce5 (diff)
downloadODR-AudioEnc-0d439d3d744f5ac8b0b0c16dcc9d1d3814ad002e.tar.gz
ODR-AudioEnc-0d439d3d744f5ac8b0b0c16dcc9d1d3814ad002e.tar.bz2
ODR-AudioEnc-0d439d3d744f5ac8b0b0c16dcc9d1d3814ad002e.zip
Merge "Remove a bionic workaround."
-rw-r--r--libSYS/include/genericStds.h3
-rw-r--r--libSYS/src/cmdl_parser.cpp3
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>