summaryrefslogtreecommitdiffstats
path: root/libSYS/include
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2013-02-27 22:06:16 +0200
committerMartin Storsjo <martin@martin.st>2013-02-27 22:06:16 +0200
commitbae4553d428accc6438102578ffd9e7968333b94 (patch)
treec062f639e8451c37afb0ff137e8e179e8b118097 /libSYS/include
parent8f9f42c1041e877c602e0acd43361d7068c3ce1c (diff)
parentdd68dcdb756966b80ad86268d7fe45b3434374c9 (diff)
downloadODR-AudioEnc-bae4553d428accc6438102578ffd9e7968333b94.tar.gz
ODR-AudioEnc-bae4553d428accc6438102578ffd9e7968333b94.tar.bz2
ODR-AudioEnc-bae4553d428accc6438102578ffd9e7968333b94.zip
Merge remote-tracking branch 'aosp/master'
Diffstat (limited to 'libSYS/include')
-rw-r--r--libSYS/include/genericStds.h3
1 files changed, 0 insertions, 3 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)