@@ -23,13 +23,14 @@
 # error No atomic operations available!
 #endif
 
 #if !defined(OF_HAVE_THREADS)
 # import "atomic_no_threads.h"
-#elif defined(OF_X86_64_ASM) || defined(OF_X86_ASM)
+#elif (defined(OF_X86_64) || defined(OF_X86)) && defined(__GNUC__)
 # import "atomic_x86.h"
-#elif defined(OF_POWERPC_ASM) && !defined(__APPLE_CC__) && !defined(OF_AIX)
+#elif defined(OF_POWERPC) && defined(__GNUC__) && !defined(__APPLE_CC__) && \
+    !defined(OF_AIX)
 # import "atomic_powerpc.h"
 #elif defined(OF_HAVE_ATOMIC_BUILTINS)
 # import "atomic_builtins.h"
 #elif defined(OF_HAVE_SYNC_BUILTINS)
 # import "atomic_sync_builtins.h"