From 997190376451354438ea29868d78999112d3971c Mon Sep 17 00:00:00 2001 From: Bruce Beare Date: Mon, 17 Jan 2011 18:46:01 -0800 Subject: [PATCH] Consistently and properly define OFF_T_DEFINED and SIZE_T_DEFINED Orig-Change-Id: I8995cf1512efc47e4e6b167a17395ba8a6957a86 Signed-off-by: Bruce Beare --- .../platforms/android-5/arch-x86/usr/include/machine/_types.h | 4 ++-- .../platforms/android-8/arch-x86/usr/include/machine/_types.h | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ndk/android-ndk-r4/platforms/android-5/arch-x86/usr/include/machine/_types.h b/ndk/android-ndk-r4/platforms/android-5/arch-x86/usr/include/machine/_types.h index be4f6e40..ec75dfa1 100644 --- a/ndk/android-ndk-r4/platforms/android-5/arch-x86/usr/include/machine/_types.h +++ b/ndk/android-ndk-r4/platforms/android-5/arch-x86/usr/include/machine/_types.h @@ -36,8 +36,8 @@ #define _I386__TYPES_H_ /* the kernel defines size_t as unsigned int, but g++ wants it to be unsigned long */ -#ifndef _SIZE_T -# define _SIZE_T +#ifndef _SIZE_T_DEFINED_ +# define _SIZE_T_DEFINED_ # ifdef ANDROID typedef unsigned int size_t; # else diff --git a/ndk/android-ndk-r4/platforms/android-8/arch-x86/usr/include/machine/_types.h b/ndk/android-ndk-r4/platforms/android-8/arch-x86/usr/include/machine/_types.h index be4f6e40..274e1694 100644 --- a/ndk/android-ndk-r4/platforms/android-8/arch-x86/usr/include/machine/_types.h +++ b/ndk/android-ndk-r4/platforms/android-8/arch-x86/usr/include/machine/_types.h @@ -54,9 +54,6 @@ typedef long int ssize_t; typedef long ptrdiff_t; #endif -#define _OFF_T_DEFINED_ -#define _SIZE_T_DEFINED_ - #include /* 7.18.1.1 Exact-width integer types */