From cad5f56a44dc3d3ed4e7f24025933fef7ef6ab14 Mon Sep 17 00:00:00 2001 From: rfm Date: Mon, 15 Feb 2010 17:51:07 +0000 Subject: [PATCH] Enable 64bit api changes matching OSX 10.5 git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@29650 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Headers/Foundation/NSObjCRuntime.h | 20 +------------------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6596a4fde..578f52a77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-02-15 Richard Frith-Macdonald + + Various reorganisation tweaks. + Enable NSInteger/NSUInteger/CGFloat support at last. + 2010-02-15 Fred Kiefer * Source/NSAttributedString.m: Implement keyed decoding for diff --git a/Headers/Foundation/NSObjCRuntime.h b/Headers/Foundation/NSObjCRuntime.h index e93cef987..7972ddb58 100644 --- a/Headers/Foundation/NSObjCRuntime.h +++ b/Headers/Foundation/NSObjCRuntime.h @@ -35,26 +35,11 @@ /* These typedefs must be in place before GSObjCRuntime.h is imported. */ - -#define GS_64BIT_OLD 1 // Temporarily disable new OSX 10.5 64bit API - - -#if defined(GS_64BIT_OLD) - -#if !defined(NSINTEGER_DEFINED) -typedef int NSInteger; -typedef unsigned int NSUInteger; -#endif -#if !defined(CGFLOAT_DEFINED) -typedef float CGFloat; -#endif - -#else /* GS_64BIT_OLD */ - #if !defined(NSINTEGER_DEFINED) typedef intptr_t NSInteger; typedef uintptr_t NSUInteger; #endif /* !defined(NSINTEGER_DEFINED) */ + #if !defined(CGFLOAT_DEFINED) #if GS_SIZEOF_VOIDP == 8 #define CGFLOAT_IS_DBL 1 @@ -64,9 +49,6 @@ typedef float CGFloat; #endif #endif /* !defined(CGFLOAT_DEFINED) */ -#endif /* GS_64BIT_OLD */ - - #define NSINTEGER_DEFINED 1 #define CGFLOAT_DEFINED 1