Merge remote-tracking branch 'aosp/master'

This commit is contained in:
Martin Storsjo 2013-02-27 22:06:16 +02:00
commit bae4553d42
2 changed files with 0 additions and 6 deletions

View File

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

View File

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