commit 0d439d3d744f5ac8b0b0c16dcc9d1d3814ad002e
author Elliott Hughes <enh@google.com> Thu Nov 29 19:32:14 2012 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 29 19:32:14 2012 -0800
tree 7a7d816decc6c0056617405a07ed4ee36170c9cd
parent 6ab36997af5d5acda4f21d33031f4e45c85f96b7
parent 1d24ddc612489f57c23e78a5deaaad91f1bf6ce5

Merge "Remove a bionic workaround."

libSYS/include/genericStds.h

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 @@
 
 #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)

libSYS/src/cmdl_parser.cpp

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 @@
 
 #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>