diff --git a/cmd/wuffs-c/release.go b/cmd/wuffs-c/release.go
index 6ea1bd6..3e42542 100644
--- a/cmd/wuffs-c/release.go
+++ b/cmd/wuffs-c/release.go
@@ -174,9 +174,9 @@
 // Wuffs' C code is generated automatically, not hand-written. These warnings'
 // costs outweigh the benefits.
 //
-// The "elif defined(__clang__)" isn't redundant. While vanilla clang defines
+// The "|| defined(__clang__)" isn't redundant. While vanilla clang defines
 // __GNUC__, clang-cl (which mimics MSVC's cl.exe) does not.
-#if defined(__GNUC__)
+#if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
@@ -186,16 +186,6 @@
 #if defined(__cplusplus)
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #endif
-#elif defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wimplicit-fallthrough"
-#pragma clang diagnostic ignored "-Wmissing-field-initializers"
-#pragma clang diagnostic ignored "-Wunreachable-code"
-#pragma clang diagnostic ignored "-Wunused-function"
-#pragma clang diagnostic ignored "-Wunused-parameter"
-#if defined(__cplusplus)
-#pragma clang diagnostic ignored "-Wold-style-cast"
-#endif
 #endif
 
 `
diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c
index 6c4e19f..b3eb2b5 100644
--- a/release/c/wuffs-unsupported-snapshot.c
+++ b/release/c/wuffs-unsupported-snapshot.c
@@ -11,9 +11,9 @@
 // Wuffs' C code is generated automatically, not hand-written. These warnings'
 // costs outweigh the benefits.
 //
-// The "elif defined(__clang__)" isn't redundant. While vanilla clang defines
+// The "|| defined(__clang__)" isn't redundant. While vanilla clang defines
 // __GNUC__, clang-cl (which mimics MSVC's cl.exe) does not.
-#if defined(__GNUC__)
+#if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
@@ -23,16 +23,6 @@
 #if defined(__cplusplus)
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #endif
-#elif defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wimplicit-fallthrough"
-#pragma clang diagnostic ignored "-Wmissing-field-initializers"
-#pragma clang diagnostic ignored "-Wunreachable-code"
-#pragma clang diagnostic ignored "-Wunused-function"
-#pragma clang diagnostic ignored "-Wunused-parameter"
-#if defined(__cplusplus)
-#pragma clang diagnostic ignored "-Wold-style-cast"
-#endif
 #endif
 
 // Copyright 2017 The Wuffs Authors.