diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2009-12-08 23:15:30 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2009-12-08 23:15:30 +0000 |
| commit | 0f0a4672c92c331d2c20b3ebc20ee977593a27fe (patch) | |
| tree | 415faa0145202c26619e0f73c6f6975490bab2e8 /FL | |
| parent | 0b0afc165b425a90fbe562dda6b85fbeea3e2c97 (diff) | |
Fumbeling about at the Cocoa implementation.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6960 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/mac.H | 28 |
1 files changed, 26 insertions, 2 deletions
@@ -36,10 +36,34 @@ // Standard MacOS Carbon API includes... #include <Carbon/Carbon.h> -#if (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5) && !__LP64__ +#include <config.h> + +#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 <config.h> +#endif + +#endif // Now make some fixes to the headers... #undef check // Dunno where this comes from... |