That last rev shouldn't have compiled, but apparently did, for some reason. Fixed.

src/google/protobuf/extension_set_unittest.cc

@@ -475,7 +475,7 @@ TEST(ExtensionSetTest, InvalidEnumDeath) {
     "IsValid");
 }
 
-#endif GTEST_HAS_DEATH_TEST
+#endif  // GTEST_HAS_DEATH_TEST
 
 }  // namespace
 }  // namespace internal