From 6f6a375fcae95d044df0a4fb68c39f8e1ee50ef3 Mon Sep 17 00:00:00 2001 From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> Date: Sun, 3 Nov 2024 14:27:28 +0100 Subject: Recent macOS SDKs badly define MAC_OS_X_VERSION_MAX_ALLOWED and the correct information is in __MAC_OS_X_VERSION_MAX_ALLOWED --- FL/mac.H | 4 ++++ src/Fl_cocoa.mm | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/FL/mac.H b/FL/mac.H index b0a2b84f5..818ea3467 100644 --- a/FL/mac.H +++ b/FL/mac.H @@ -47,6 +47,10 @@ typedef class FLWindow *Window; // pointer to the FLWindow objective-c class // Standard MacOS C/C++ includes... #include #undef check // because of Fl::check() +#ifdef __MAC_OS_X_VERSION_MAX_ALLOWED +# undef MAC_OS_X_VERSION_MAX_ALLOWED +# define MAC_OS_X_VERSION_MAX_ALLOWED __MAC_OS_X_VERSION_MAX_ALLOWED +#endif #ifndef MAC_OS_X_VERSION_10_4 #define MAC_OS_X_VERSION_10_4 1040 diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index c32c0fa3e..aadb98961 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -49,10 +49,6 @@ extern "C" { #include #import -#ifdef __MAC_OS_X_VERSION_MAX_ALLOWED -# undef MAC_OS_X_VERSION_MAX_ALLOWED -# define MAC_OS_X_VERSION_MAX_ALLOWED __MAC_OS_X_VERSION_MAX_ALLOWED -#endif #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_VERSION_15_0 # import #endif -- cgit v1.2.3