From 1d24ddc612489f57c23e78a5deaaad91f1bf6ce5 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 29 Nov 2012 17:12:31 -0800 Subject: Remove a bionic workaround. (Requires corresponding bionic patch 3975cec694a0c9b42e3f7e671fcd678da92836c3.) Change-Id: Ief968db33e2f9e1957510bbd59f25faa6828d678 --- libSYS/include/genericStds.h | 3 --- libSYS/src/cmdl_parser.cpp | 3 --- 2 files changed, 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 #include #include -- cgit v1.2.3 From 03a143bcb419b717c789be42e90ea6c5fa3c109f Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 29 Nov 2012 17:12:31 -0800 Subject: Remove a bionic workaround. (Requires corresponding bionic patch 3975cec694a0c9b42e3f7e671fcd678da92836c3.) (cherry-pick of 1d24ddc612489f57c23e78a5deaaad91f1bf6ce5.) Change-Id: I7105b17c285ff24fb48be23cf2067aef37f36d45 --- libSYS/include/genericStds.h | 3 --- libSYS/src/cmdl_parser.cpp | 3 --- 2 files changed, 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 #include #include -- cgit v1.2.3