Mesa (main): asahi: Fix macOS macro.

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Jun 24 13:56:34 UTC 2021


Module: Mesa
Branch: main
Commit: 6fe82e6c1e36892d9c9625e233a9f250893630a2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6fe82e6c1e36892d9c9625e233a9f250893630a2

Author: Vinson Lee <vlee at freedesktop.org>
Date:   Wed Jun 23 22:51:16 2021 -0700

asahi: Fix macOS macro.

Fixes: 26b19bda306 ("asahi: Add device abstraction")
Fixes: 55c0956fd00 ("asahi: Add (clean room) IOKit uABI header")
Signed-off-by: Vinson Lee <vlee at freedesktop.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11569>

---

 src/asahi/lib/agx_device.c | 2 +-
 src/asahi/lib/io.h         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/asahi/lib/agx_device.c b/src/asahi/lib/agx_device.c
index 5872de908ab..3ccbc629633 100644
--- a/src/asahi/lib/agx_device.c
+++ b/src/asahi/lib/agx_device.c
@@ -315,7 +315,7 @@ agx_close_device(struct agx_device *dev)
 uint64_t
 agx_cmdbuf_global_ids(struct agx_device *dev)
 {
-#if __APPLE
+#if __APPLE__
    uint32_t out[4] = {};
    size_t out_sz = sizeof(out);
 
diff --git a/src/asahi/lib/io.h b/src/asahi/lib/io.h
index e5915b05654..d004c4751db 100644
--- a/src/asahi/lib/io.h
+++ b/src/asahi/lib/io.h
@@ -168,7 +168,7 @@ agx_memory_type_name(uint32_t type)
 }
 
 struct agx_notification_queue {
-#ifdef __APPLE
+#ifdef __APPLE__
    mach_port_t port;
    IODataQueueMemory *queue;
 #else



More information about the mesa-commit mailing list