| Message ID | 20240502142904.62644-1-peter.maydell@linaro.org |
|---|---|
| State | Accepted |
| Commit | 2d27c91e2b72ac7a65504ac207c89262d92464eb |
| Headers | show |
| Series | ui/cocoa.m: Drop old macOS-10.12-and-earlier compat ifdefs | expand |
On Thu, May 02, 2024 at 03:29:04PM +0100, Peter Maydell wrote: > We only support the most recent two versions of macOS (currently > macOS 13 Ventura and macOS 14 Sonoma), and our ui/cocoa.m code > already assumes at least macOS 12 Monterey or better, because it uses > NSScreen safeAreaInsets, which is 12.0-or-newer. > > Remove the ifdefs that were providing backwards compatibility for > building on 10.12 and earlier versions. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > ui/cocoa.m | 13 ------------- > 1 file changed, 13 deletions(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> With regards, Daniel
On 2/5/24 16:29, Peter Maydell wrote: > We only support the most recent two versions of macOS (currently > macOS 13 Ventura and macOS 14 Sonoma), and our ui/cocoa.m code > already assumes at least macOS 12 Monterey or better, because it uses > NSScreen safeAreaInsets, which is 12.0-or-newer. > > Remove the ifdefs that were providing backwards compatibility for > building on 10.12 and earlier versions. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > ui/cocoa.m | 13 ------------- > 1 file changed, 13 deletions(-) Thanks, patch queued.
diff --git a/ui/cocoa.m b/ui/cocoa.m index 25e0db9dd0b..981615a8b92 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -50,23 +50,10 @@ #include <Carbon/Carbon.h> #include "hw/core/cpu.h" -#ifndef MAC_OS_X_VERSION_10_13 -#define MAC_OS_X_VERSION_10_13 101300 -#endif - #ifndef MAC_OS_VERSION_14_0 #define MAC_OS_VERSION_14_0 140000 #endif -/* 10.14 deprecates NSOnState and NSOffState in favor of - * NSControlStateValueOn/Off, which were introduced in 10.13. - * Define for older versions - */ -#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_13 -#define NSControlStateValueOn NSOnState -#define NSControlStateValueOff NSOffState -#endif - //#define DEBUG #ifdef DEBUG
We only support the most recent two versions of macOS (currently macOS 13 Ventura and macOS 14 Sonoma), and our ui/cocoa.m code already assumes at least macOS 12 Monterey or better, because it uses NSScreen safeAreaInsets, which is 12.0-or-newer. Remove the ifdefs that were providing backwards compatibility for building on 10.12 and earlier versions. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- ui/cocoa.m | 13 ------------- 1 file changed, 13 deletions(-)