$OpenBSD: patch-src_google_protobuf_reflection_ops_unittest_cc,v 1.1 2017/05/17 20:23:45 sthen Exp $

Index: src/google/protobuf/reflection_ops_unittest.cc
--- src/google/protobuf/reflection_ops_unittest.cc.orig
+++ src/google/protobuf/reflection_ops_unittest.cc
@@ -152,6 +152,9 @@ TEST(ReflectionOpsTest, MergeUnknown) {
   EXPECT_EQ(2, message1.unknown_fields().field(1).varint());
 }
 
+// Older version of protobuf incompatible with new version of gtest.
+// https://groups.google.com/d/msg/protobuf/xgGBG-_WYy8/ruf1MKDr-sIJ
+#undef GTEST_HAS_DEATH_TEST
 #ifdef GTEST_HAS_DEATH_TEST
 
 TEST(ReflectionOpsTest, MergeFromSelf) {
