From 6e24a409f4529dce5dd2d17638e4c8ada19eba05 Mon Sep 17 00:00:00 2001
From: Violet Purcell <vimproved@inventati.org>
Date: Sat, 23 Sep 2023 13:44:10 -0400
Subject: [PATCH] Use <atomic> instead of <stdatomic.h> in libc++ fix

The definitions from <stdatomic.h> conflict with <atomic>, which causes
a build failure since <atomic> is included previously.

Signed-off-by: Violet Purcell <vimproved@inventati.org>
---
 libs/vst3/pluginterfaces/base/funknown.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libs/vst3/pluginterfaces/base/funknown.cpp b/libs/vst3/pluginterfaces/base/funknown.cpp
index 738889a332..f0ced63d2c 100644
--- a/libs/vst3/pluginterfaces/base/funknown.cpp
+++ b/libs/vst3/pluginterfaces/base/funknown.cpp
@@ -44,9 +44,9 @@
 #endif
 
 #if SMTG_OS_LINUX
-#if !defined (SMTG_USE_STDATOMIC_H)
+#if !defined (SMTG_USE_ATOMIC)
 #if defined (_LIBCPP_VERSION)
-#define SMTG_USE_STDATOMIC_H 1
+#define SMTG_USE_ATOMIC 1
 #else
 #include <ext/atomicity.h>
 #endif
@@ -57,8 +57,8 @@
 #include <boost/uuid/uuid_generators.hpp>
 #endif
 
-#if defined (SMTG_USE_STDATOMIC_H) && SMTG_USE_STDATOMIC_H
-#include <stdatomic.h>
+#if defined (SMTG_USE_ATOMIC) && SMTG_USE_ATOMIC
+#include <atomic>
 #endif
 
 namespace Steinberg {
@@ -89,8 +89,8 @@ namespace FUnknownPrivate {
 //------------------------------------------------------------------------
 int32 PLUGIN_API atomicAdd (int32& var, int32 d)
 {
-#if SMTG_USE_STDATOMIC_H
-	return atomic_fetch_add (reinterpret_cast<atomic_int_least32_t*> (&var), d) +d;
+#if SMTG_USE_ATOMIC
+	return atomic_fetch_add (reinterpret_cast<std::atomic_int_least32_t*> (&var), d) +d;
 #elif SMTG_OS_WINDOWS
 	return InterlockedExchangeAdd ((volatile long int*)&var, d) + d;
 #elif SMTG_OS_MACOS