Use stdatomic.h on recent macOS

nobu · eregon · commit eacd77a07c65 · 2025-12-09T00:32:43.000+01:00
diff --git a/ext/concurrent-ruby-ext/atomic_reference.c b/ext/concurrent-ruby-ext/atomic_reference.c
@@ -78,7 +78,11 @@ VALUE ir_get_and_set(VALUE self, VALUE new_value){
 }
 
 VALUE ir_compare_and_set(volatile VALUE self, VALUE expect_value, VALUE new_value){
-#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050
+#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101200
+ if (atomic_compare_exchange_strong_explicit((_Atomic uintptr_t *)&DATA_PTR(self), &expect_value, new_value, memory_order_seq_cst, memory_order_seq_cst)){
+ return Qtrue;
+ }
+#elif defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050
 if (OSAtomicCompareAndSwap64(expect_value, new_value, &DATA_PTR(self))){
 return Qtrue;
 }
diff --git a/ext/concurrent-ruby-ext/atomic_reference.h b/ext/concurrent-ruby-ext/atomic_reference.h
@@ -5,6 +5,9 @@
 #include <atomic.h>
 #endif
 
+#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101200
+#include <stdatomic.h>
+#endif
 #ifdef HAVE_LIBKERN_OSATOMIC_H
 #include <libkern/OSAtomic.h>
 #endif

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,11 @@ VALUE ir_get_and_set(VALUE self, VALUE new_value){`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`VALUEir_compare_and_set(volatileVALUEself, VALUEexpect_value, VALUEnew_value){`
`81`		`-#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) &&__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050`
	`81`	`+#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) &&__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101200`
	`82`	`+if (atomic_compare_exchange_strong_explicit((_Atomic uintptr_t*)&DATA_PTR(self), &expect_value, new_value, memory_order_seq_cst, memory_order_seq_cst)){`
	`83`	`+returnQtrue;`
	`84`	`+ }`
	`85`	`+#elif defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) &&__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050`
`82`	`86`	`if (OSAtomicCompareAndSwap64(expect_value, new_value, &DATA_PTR(self))){`
`83`	`87`	`returnQtrue;`
`84`	`88`	`}`
-Original file line number
+Diff line change
 #include<atomic.h>
 #endif
 +#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) &&__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101200
 +#include<stdatomic.h>
 +#endif
 #ifdefHAVE_LIBKERN_OSATOMIC_H
 #include<libkern/OSAtomic.h>
 #endif