diff --git a/src/Transform_inl.h b/src/Transform_inl.h
index 4ec175c..2d76010 100644
--- a/src/Transform_inl.h
+++ b/src/Transform_inl.h
@@ -63,11 +63,15 @@
     #pragma clang diagnostic ignored "-Wvector-conversion"
 #endif
 
-// GCC warns us about returning U64 on x86 because it's larger than a register.
+// GCC & Clang warn us about returning U64 on x86 because it's larger than a register.
 // You'd see warnings like, "using AVX even though AVX is not enabled".
 // We stifle these warnings... our helpers that return U64 are always inlined.
-#if defined(__SSE__) && defined(__GNUC__) && !defined(__clang__)
-    #pragma GCC diagnostic ignored "-Wpsabi"
+#if defined(__SSE__)
+    #if defined(__clang__) && !defined(_MSC_VER)
+        #pragma clang diagnostic ignored "-Wpsabi"
+    #elif defined(__GNUC__)
+        #pragma GCC diagnostic ignored "-Wpsabi"
+    #endif
 #endif
 
 #if defined(__clang__)