From 84f8b3ad9c5b2695c209744304dd9de71ad8d092 Mon Sep 17 00:00:00 2001 From: Bruce Beare Date: Sun, 26 Dec 2010 09:29:57 -0800 Subject: [PATCH] use consistent guards for off_t and size_t defines for IA Orig-Change-Id: I9347ab4407c48c71c99f42583523ebe31a5e67ae Signed-off-by: Bruce Beare --- libc/arch-x86/include/machine/_types.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libc/arch-x86/include/machine/_types.h b/libc/arch-x86/include/machine/_types.h index be4f6e409..e9280a5da 100644 --- a/libc/arch-x86/include/machine/_types.h +++ b/libc/arch-x86/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 @@ -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 */