From 6c92cc9a8d7e5b3aa90e3b4541201dbbd4ef3fc4 Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Sun, 27 Apr 2014 13:57:09 +0000 Subject: Fix STR#3063: compilation using Mac OS 10.4 git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10127 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/mac.H | 32 ++++++++++++++++---------------- test/blocks.cxx | 3 +++ test/sudoku.cxx | 3 +++ 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/FL/mac.H b/FL/mac.H index 2bd340400..8ea1bb0ad 100644 --- a/FL/mac.H +++ b/FL/mac.H @@ -49,6 +49,22 @@ typedef CGContextRef Fl_Offscreen; #include #undef check // because of Fl::check() +#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_10_7 +#define MAC_OS_X_VERSION_10_7 1070 +#endif +#ifndef MAC_OS_X_VERSION_10_8 +#define MAC_OS_X_VERSION_10_8 1080 +#endif + #ifdef __OBJC__ @class NSCursor; #else @@ -150,22 +166,6 @@ extern Window fl_window; #endif // FL_LIBRARY || FL_INTERNALS -#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_10_7 -#define MAC_OS_X_VERSION_10_7 1070 -#endif -#ifndef MAC_OS_X_VERSION_10_8 -#define MAC_OS_X_VERSION_10_8 1080 -#endif - typedef CGImageRef Fl_Bitmask; extern CGContextRef fl_gc; diff --git a/test/blocks.cxx b/test/blocks.cxx index bb2f0191a..43c3ffe19 100644 --- a/test/blocks.cxx +++ b/test/blocks.cxx @@ -139,6 +139,9 @@ class BlockSound { // Private, OS-specific data... #ifdef __APPLE__ AudioDeviceID device; +#ifndef MAC_OS_X_VERSION_10_5 +#define MAC_OS_X_VERSION_10_5 1050 +#endif # if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 AudioDeviceIOProcID audio_proc_id; # endif diff --git a/test/sudoku.cxx b/test/sudoku.cxx index f6a27c784..27677b3e9 100644 --- a/test/sudoku.cxx +++ b/test/sudoku.cxx @@ -90,6 +90,9 @@ class SudokuSound { // Private, OS-specific data... #ifdef __APPLE__ AudioDeviceID device; +#ifndef MAC_OS_X_VERSION_10_5 +#define MAC_OS_X_VERSION_10_5 1050 +#endif # if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 AudioDeviceIOProcID audio_proc_id; # endif -- cgit v1.2.3