Consistently and properly define OFF_T_DEFINED and SIZE_T_DEFINED

Orig-Change-Id: I8995cf1512efc47e4e6b167a17395ba8a6957a86 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
spica234 · Jul 7, 2011 · 9971903 · 9971903
1 parent 0e0fe4a
commit 9971903
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -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
@@ -54,9 +54,6 @@ typedef long int       ssize_t;
 typedef long           ptrdiff_t;
 #endif
 
-#define _OFF_T_DEFINED_
-#define _SIZE_T_DEFINED_
-
 #include <linux/types.h>
 
 /* 7.18.1.1 Exact-width integer types */