From 0f0a4672c92c331d2c20b3ebc20ee977593a27fe Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Tue, 8 Dec 2009 23:15:30 +0000 Subject: Fumbeling about at the Cocoa implementation. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6960 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/mac.H | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) (limited to 'FL') diff --git a/FL/mac.H b/FL/mac.H index 5f815c7da..ae35224cd 100644 --- a/FL/mac.H +++ b/FL/mac.H @@ -36,10 +36,34 @@ // Standard MacOS Carbon API includes... #include -#if (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5) && !__LP64__ +#include + +#ifdef __APPLE_COCOA__ +#ifndef MAC_OS_X_VERSION_10_3 +#define MAC_OS_X_VERSION_10_3 1030 +#endif +#ifndef MAC_OS_X_VERSION_10_4 +#define MAC_OS_X_VERSION_10_4 1040 +#endif +#ifndef MAC_OS_X_VERSION_10_5 +#define MAC_OS_X_VERSION_10_5 1050 +#endif +#ifndef MAC_OS_X_VERSION_10_6 +#define MAC_OS_X_VERSION_10_6 1060 +#endif +#ifndef MAC_OS_X_VERSION_MAX_ALLOWED +#define MAC_OS_X_VERSION_MAX_ALLOWED MAC_OS_X_VERSION_10_3 +#endif + +#ifndef CGFLOAT_DEFINED //appears with 10.5 in CGBase.h +#if defined(__LP64__) && __LP64__ +typedef double CGFloat; +#else typedef float CGFloat; #endif -#include +#endif + +#endif // Now make some fixes to the headers... #undef check // Dunno where this comes from... -- cgit v1.2.3