[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 14/14] ui/cocoa.m: Drop old macOS-10.12-and-earlier compat ifdefs
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 14/14] ui/cocoa.m: Drop old macOS-10.12-and-earlier compat ifdefs |
Date: |
Fri, 3 May 2024 17:36:13 +0200 |
From: Peter Maydell <peter.maydell@linaro.org>
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>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20240502142904.62644-1-peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
ui/cocoa.m | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/ui/cocoa.m b/ui/cocoa.m
index 25e0db9dd0..981615a8b9 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
--
2.41.0
- [PULL 04/14] user: Move 'abitypes.h' from 'exec/user' to 'user', (continued)
- [PULL 04/14] user: Move 'abitypes.h' from 'exec/user' to 'user', Philippe Mathieu-Daudé, 2024/05/03
- [PULL 05/14] user: Move 'thunk.h' from 'exec/user' to 'user', Philippe Mathieu-Daudé, 2024/05/03
- [PULL 06/14] coverity: Update user emulation regexp, Philippe Mathieu-Daudé, 2024/05/03
- [PULL 08/14] plugins: Update stale comment, Philippe Mathieu-Daudé, 2024/05/03
- [PULL 09/14] MAINTAINERS: Update my email address, Philippe Mathieu-Daudé, 2024/05/03
- [PULL 07/14] plugins/api: Only include 'exec/ram_addr.h' with system emulation, Philippe Mathieu-Daudé, 2024/05/03
- [PULL 10/14] target/sh4: Fix ADDV opcode, Philippe Mathieu-Daudé, 2024/05/03
- [PULL 11/14] target/sh4: Fix SUBV opcode, Philippe Mathieu-Daudé, 2024/05/03
- [PULL 12/14] target/sh4: Rename TCGv variables as manual for ADDV opcode, Philippe Mathieu-Daudé, 2024/05/03
- [PULL 13/14] target/sh4: Rename TCGv variables as manual for SUBV opcode, Philippe Mathieu-Daudé, 2024/05/03
- [PULL 14/14] ui/cocoa.m: Drop old macOS-10.12-and-earlier compat ifdefs,
Philippe Mathieu-Daudé <=
- Re: [PULL 00/14] Accel / SH4 / UI patches for 2024-05-03, Richard Henderson, 2024/05/03