mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 16:33:29 +00:00
define CGFLOAT_DEFINED when defining CGFloat.
Also check that NSINTEGER_DEFINED and CGFLOAT_DEFINED are undefined before defining NSInterger and CGFloat. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@29351 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
85d9f728f5
commit
3110312b36
2 changed files with 16 additions and 0 deletions
|
@ -1,3 +1,10 @@
|
|||
2010-01-21 Eric Wasylishen <ewasylishen@gmail.com>
|
||||
|
||||
* Headers/Foundation/NSObjCRuntime.h: define CGFLOAT_DEFINED when
|
||||
defining CGFloat.
|
||||
Also check that NSINTEGER_DEFINED and CGFLOAT_DEFINED are undefined
|
||||
before defining NSInterger and CGFloat.
|
||||
|
||||
2010-01-21 16:20-EST Gregory John Casamento <greg.casamento@gmail.com>
|
||||
|
||||
* install.sh: Add --with-installation-domain=SYSTEM to the script
|
||||
|
|
|
@ -41,25 +41,34 @@
|
|||
|
||||
#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
|
||||
typedef double CGFloat;
|
||||
#else
|
||||
typedef float CGFloat;
|
||||
#endif
|
||||
#endif /* !defined(CGFLOAT_DEFINED) */
|
||||
|
||||
#endif /* GS_64BIT_OLD */
|
||||
|
||||
|
||||
#define NSINTEGER_DEFINED 1
|
||||
#define CGFLOAT_DEFINED 1
|
||||
|
||||
#import <GNUstepBase/GSObjCRuntime.h>
|
||||
|
||||
|
|
Loading…
Reference in a new issue