diff --git a/headers/os/support/SupportDefs.h b/headers/os/support/SupportDefs.h
index b8633345da..7e47018178 100644
--- a/headers/os/support/SupportDefs.h
+++ b/headers/os/support/SupportDefs.h
@@ -215,8 +215,7 @@ extern void*	get_stack_frame(void);
 
 /* Use the built-in atomic functions, if requested and available. */
 
-#if defined(B_USE_BUILTIN_ATOMIC_FUNCTIONS) && __GNUC__ > 4	\
-	|| (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)
 
 
 static inline void
@@ -321,8 +320,7 @@ atomic_get64(int64* value)
 }
 
 
-#else	// B_USE_BUILTIN_ATOMIC_FUNCTIONS && __GNUC__ > 4
-		//	|| (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)
+#else	// __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)
 
 #ifdef __cplusplus
 extern "C" {