diff --git a/include/ruby/atomic.h b/include/ruby/atomic.h
index 4cf891b345c3b9..b778276f62d887 100644
--- a/include/ruby/atomic.h
+++ b/include/ruby/atomic.h
@@ -77,6 +77,9 @@ typedef unsigned int rb_atomic_t;
 typedef LONG rb_atomic_t;
 #elif defined(__sun) && defined(HAVE_ATOMIC_H)
 typedef unsigned int rb_atomic_t;
+#elif defined(HAVE_STDATOMIC_H)
+# include <stdatomic.h>
+typedef unsigned int rb_atomic_t;
 #else
 # error No atomic operation found
 #endif
@@ -408,6 +411,9 @@ rbimpl_atomic_fetch_add(volatile rb_atomic_t *ptr, rb_atomic_t val)
     RBIMPL_ASSERT_OR_ASSUME(val <= INT_MAX);
     return atomic_add_int_nv(ptr, val) - val;
 
+#elif defined(HAVE_STDATOMIC_H)
+    return atomic_fetch_add((_Atomic volatile rb_atomic_t *)ptr, val);
+
 #else
 # error Unsupported platform.
 #endif
@@ -436,12 +442,17 @@ rbimpl_atomic_size_fetch_add(volatile size_t *ptr, size_t val)
     RBIMPL_ASSERT_OR_ASSUME(val <= LONG_MAX);
     atomic_add_long(ptr, val);
 
-#else
+#elif defined(__sun) && defined(HAVE_ATOMIC_H)
     RBIMPL_STATIC_ASSERT(size_of_rb_atomic_t, sizeof *ptr == sizeof(rb_atomic_t));
 
     volatile rb_atomic_t *const tmp = RBIMPL_CAST((volatile rb_atomic_t *)ptr);
     rbimpl_atomic_fetch_add(tmp, val);
 
+#elif defined(HAVE_STDATOMIC_H)
+    return atomic_fetch_add((_Atomic volatile size_t *)ptr, val);
+
+#else
+# error Unsupported platform.
 #endif
 }
 
@@ -477,6 +488,9 @@ rbimpl_atomic_add(volatile rb_atomic_t *ptr, rb_atomic_t val)
     RBIMPL_ASSERT_OR_ASSUME(val <= INT_MAX);
     atomic_add_int(ptr, val);
 
+#elif defined(HAVE_STDATOMIC_H)
+    *(_Atomic volatile rb_atomic_t *)ptr += val;
+
 #else
 # error Unsupported platform.
 #endif
@@ -505,12 +519,17 @@ rbimpl_atomic_size_add(volatile size_t *ptr, size_t val)
     RBIMPL_ASSERT_OR_ASSUME(val <= LONG_MAX);
     atomic_add_long(ptr, val);
 
-#else
+#elif defined(_WIN32) || (defined(__sun) && defined(HAVE_ATOMIC_H))
     RBIMPL_STATIC_ASSERT(size_of_rb_atomic_t, sizeof *ptr == sizeof(rb_atomic_t));
 
     volatile rb_atomic_t *const tmp = RBIMPL_CAST((volatile rb_atomic_t *)ptr);
     rbimpl_atomic_add(tmp, val);
 
+#elif defined(HAVE_STDATOMIC_H)
+    *(_Atomic volatile size_t *)ptr += val;
+
+#else
+# error Unsupported platform.
 #endif
 }
 
@@ -531,9 +550,11 @@ rbimpl_atomic_inc(volatile rb_atomic_t *ptr)
 #elif defined(__sun) && defined(HAVE_ATOMIC_H)
     atomic_inc_uint(ptr);
 
-#else
+#elif defined(HAVE_STDATOMIC_H)
     rbimpl_atomic_add(ptr, 1);
 
+#else
+# error Unsupported platform.
 #endif
 }
 
@@ -554,11 +575,16 @@ rbimpl_atomic_size_inc(volatile size_t *ptr)
 #elif defined(__sun) && defined(HAVE_ATOMIC_H) && (defined(_LP64) || defined(_I32LPx))
     atomic_inc_ulong(ptr);
 
-#else
+#elif defined(_WIN32) || (defined(__sun) && defined(HAVE_ATOMIC_H))
     RBIMPL_STATIC_ASSERT(size_of_size_t, sizeof *ptr == sizeof(rb_atomic_t));
 
     rbimpl_atomic_size_add(ptr, 1);
 
+#elif defined(HAVE_STDATOMIC_H)
+    rbimpl_atomic_size_add(ptr, 1);
+
+#else
+# error Unsupported platform.
 #endif
 }
 
@@ -586,6 +612,9 @@ rbimpl_atomic_fetch_sub(volatile rb_atomic_t *ptr, rb_atomic_t val)
     RBIMPL_ASSERT_OR_ASSUME(val <= INT_MAX);
     return atomic_add_int_nv(ptr, neg * val) + val;
 
+#elif defined(HAVE_STDATOMIC_H)
+    return atomic_fetch_sub((_Atomic volatile rb_atomic_t *)ptr, val);
+
 #else
 # error Unsupported platform.
 #endif
@@ -613,6 +642,9 @@ rbimpl_atomic_sub(volatile rb_atomic_t *ptr, rb_atomic_t val)
     RBIMPL_ASSERT_OR_ASSUME(val <= INT_MAX);
     atomic_add_int(ptr, neg * val);
 
+#elif defined(HAVE_STDATOMIC_H)
+    *(_Atomic volatile rb_atomic_t *)ptr -= val;
+
 #else
 # error Unsupported platform.
 #endif
@@ -641,12 +673,17 @@ rbimpl_atomic_size_sub(volatile size_t *ptr, size_t val)
     RBIMPL_ASSERT_OR_ASSUME(val <= LONG_MAX);
     atomic_add_long(ptr, neg * val);
 
-#else
+#elif defined(_WIN32) || (defined(__sun) && defined(HAVE_ATOMIC_H))
     RBIMPL_STATIC_ASSERT(size_of_rb_atomic_t, sizeof *ptr == sizeof(rb_atomic_t));
 
     volatile rb_atomic_t *const tmp = RBIMPL_CAST((volatile rb_atomic_t *)ptr);
     rbimpl_atomic_sub(tmp, val);
 
+#elif defined(HAVE_STDATOMIC_H)
+    *(_Atomic volatile size_t *)ptr -= val;
+
+#else
+# error Unsupported platform.
 #endif
 }
 
@@ -667,9 +704,11 @@ rbimpl_atomic_dec(volatile rb_atomic_t *ptr)
 #elif defined(__sun) && defined(HAVE_ATOMIC_H)
     atomic_dec_uint(ptr);
 
-#else
+#elif defined(HAVE_STDATOMIC_H)
     rbimpl_atomic_sub(ptr, 1);
 
+#else
+# error Unsupported platform.
 #endif
 }
 
@@ -690,11 +729,16 @@ rbimpl_atomic_size_dec(volatile size_t *ptr)
 #elif defined(__sun) && defined(HAVE_ATOMIC_H) && (defined(_LP64) || defined(_I32LPx))
     atomic_dec_ulong(ptr);
 
-#else
+#elif defined(_WIN32) || (defined(__sun) && defined(HAVE_ATOMIC_H))
     RBIMPL_STATIC_ASSERT(size_of_size_t, sizeof *ptr == sizeof(rb_atomic_t));
 
     rbimpl_atomic_size_sub(ptr, 1);
 
+#elif defined(HAVE_STDATOMIC_H)
+    rbimpl_atomic_size_sub(ptr, 1);
+
+#else
+# error Unsupported platform.
 #endif
 }
 
@@ -731,6 +775,9 @@ rbimpl_atomic_or(volatile rb_atomic_t *ptr, rb_atomic_t val)
 #elif defined(__sun) && defined(HAVE_ATOMIC_H)
     atomic_or_uint(ptr, val);
 
+#elif !defined(_WIN32) && defined(HAVE_STDATOMIC_H)
+    *(_Atomic volatile rb_atomic_t *)ptr |= val;
+
 #else
 # error Unsupported platform.
 #endif
@@ -765,6 +812,9 @@ rbimpl_atomic_exchange(volatile rb_atomic_t *ptr, rb_atomic_t val)
 #elif defined(__sun) && defined(HAVE_ATOMIC_H)
     return atomic_swap_uint(ptr, val);
 
+#elif defined(HAVE_STDATOMIC_H)
+    return atomic_exchange((_Atomic volatile rb_atomic_t *)ptr, val);
+
 #else
 # error Unsupported platform.
 #endif
@@ -790,13 +840,18 @@ rbimpl_atomic_size_exchange(volatile size_t *ptr, size_t val)
 #elif defined(__sun) && defined(HAVE_ATOMIC_H) && (defined(_LP64) || defined(_I32LPx))
     return atomic_swap_ulong(ptr, val);
 
-#else
+#elif defined(_WIN32) || (defined(__sun) && defined(HAVE_ATOMIC_H))
     RBIMPL_STATIC_ASSERT(size_of_size_t, sizeof *ptr == sizeof(rb_atomic_t));
 
     volatile rb_atomic_t *const tmp = RBIMPL_CAST((volatile rb_atomic_t *)ptr);
     const rb_atomic_t ret = rbimpl_atomic_exchange(tmp, val);
     return RBIMPL_CAST((size_t)ret);
 
+#elif defined(HAVE_STDATOMIC_H)
+    return atomic_exchange((_Atomic volatile size_t *)ptr, val);
+
+#else
+# error Unsupported platform.
 #endif
 }
 
@@ -947,6 +1002,11 @@ rbimpl_atomic_cas(volatile rb_atomic_t *ptr, rb_atomic_t oldval, rb_atomic_t new
 #elif defined(__sun) && defined(HAVE_ATOMIC_H)
     return atomic_cas_uint(ptr, oldval, newval);
 
+#elif defined(HAVE_STDATOMIC_H)
+    atomic_compare_exchange_strong(
+        (_Atomic volatile rb_atomic_t *)ptr, &oldval, newval);
+    return oldval;
+
 #else
 # error Unsupported platform.
 #endif
@@ -983,12 +1043,19 @@ rbimpl_atomic_size_cas(volatile size_t *ptr, size_t oldval, size_t newval)
 #elif defined(__sun) && defined(HAVE_ATOMIC_H) && (defined(_LP64) || defined(_I32LPx))
     return atomic_cas_ulong(ptr, oldval, newval);
 
-#else
+#elif defined(_WIN32) || (defined(__sun) && defined(HAVE_ATOMIC_H))
     RBIMPL_STATIC_ASSERT(size_of_size_t, sizeof *ptr == sizeof(rb_atomic_t));
 
     volatile rb_atomic_t *tmp = RBIMPL_CAST((volatile rb_atomic_t *)ptr);
     return rbimpl_atomic_cas(tmp, oldval, newval);
 
+#elif defined(HAVE_STDATOMIC_H)
+    atomic_compare_exchange_strong(
+        (_Atomic volatile size_t *)ptr, &oldval, newval);
+    return oldval;
+
+#else
+# error Unsupported platform.
 #endif
 }
 

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/ruby/ruby/pull/13799.diff" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/ruby/ruby/pull/13799.diff" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/ruby/ruby/pull/13799.diff" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/ruby/ruby/pull/13799.diff" target="_blank">pFad v4 Proxy</a></p></body>
</html>