diff --git a/src/google/protobuf/extension_set.h b/src/google/protobuf/extension_set.h
index ffacf56b..14d5d150 100644
--- a/src/google/protobuf/extension_set.h
+++ b/src/google/protobuf/extension_set.h
@@ -97,11 +97,13 @@ struct ExtensionInfo {
   bool is_repeated;
   bool is_packed;
 
+  struct EnumValidityCheck {
+    EnumValidityFuncWithArg* func;
+    const void* arg;
+  };
+
   union {
-    struct {
-      EnumValidityFuncWithArg* func;
-      const void* arg;
-    } enum_validity_check;
+    EnumValidityCheck enum_validity_check;
     const MessageLite* message_prototype;
   };