From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Daniel P . Berrangé" <berrange@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
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 [thread overview]
Message-ID: <20240503153613.38709-15-philmd@linaro.org> (raw)
In-Reply-To: <20240503153613.38709-1-philmd@linaro.org>
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
next prev parent reply other threads:[~2024-05-03 15:38 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-03 15:35 [PULL 00/14] Accel / SH4 / UI patches for 2024-05-03 Philippe Mathieu-Daudé
2024-05-03 15:36 ` [PULL 01/14] accel/nvmm: Fix NULL dereference in nvmm_init_vcpu() Philippe Mathieu-Daudé
2024-05-03 15:36 ` [PULL 02/14] accel/whpx: Fix NULL dereference in whpx_init_vcpu() Philippe Mathieu-Daudé
2024-05-03 15:36 ` [PULL 03/14] exec: Include missing license in 'exec/cpu-common.h' Philippe Mathieu-Daudé
2024-05-03 15:36 ` [PULL 04/14] user: Move 'abitypes.h' from 'exec/user' to 'user' Philippe Mathieu-Daudé
2024-05-03 15:36 ` [PULL 05/14] user: Move 'thunk.h' " Philippe Mathieu-Daudé
2024-05-03 15:36 ` [PULL 06/14] coverity: Update user emulation regexp Philippe Mathieu-Daudé
2024-05-03 15:36 ` [PULL 07/14] plugins/api: Only include 'exec/ram_addr.h' with system emulation Philippe Mathieu-Daudé
2024-05-03 15:36 ` [PULL 08/14] plugins: Update stale comment Philippe Mathieu-Daudé
2024-05-03 15:36 ` [PULL 09/14] MAINTAINERS: Update my email address Philippe Mathieu-Daudé
2024-05-03 15:36 ` [PULL 10/14] target/sh4: Fix ADDV opcode Philippe Mathieu-Daudé
2024-05-03 15:36 ` [PULL 11/14] target/sh4: Fix SUBV opcode Philippe Mathieu-Daudé
2024-05-03 15:36 ` [PULL 12/14] target/sh4: Rename TCGv variables as manual for ADDV opcode Philippe Mathieu-Daudé
2024-05-03 15:36 ` [PULL 13/14] target/sh4: Rename TCGv variables as manual for SUBV opcode Philippe Mathieu-Daudé
2024-05-03 15:36 ` Philippe Mathieu-Daudé [this message]
2024-05-04 2:01 ` [PULL 00/14] Accel / SH4 / UI patches for 2024-05-03 Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240503153613.38709-15-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=berrange@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).