@@ -206,12 +206,12 @@
 	    isEqual: RESULT])
 	/*
 	 * Don't try fpret on Win64 if we don't have stret forwarding, as
 	 * long double is handled as a struct there.
 	 */
-# if !defined(OF_WINDOWS) || !defined(OF_X86_64) || \
-	defined(OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR_STRET)
+# if !defined(OF_WINDOWS) || !defined(OF_AMD64) || \
+    defined(OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR_STRET)
 	TEST(@"-[forwardingTargetForSelector:] fp return",
 	    [testObject forwardingTargetFPRetTest] == 12345678.00006103515625)
 # endif
 # ifdef OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR_STRET
 	TEST(@"-[forwardingTargetForSelector:] struct return",