Revert "third_party/protobuf: Update to HEAD (5f65ee6ac7)"

third_party/protobuf/objectivec/google/protobuf/Empty.pbobjc.m

Index: third_party/protobuf/objectivec/google/protobuf/Empty.pbobjc.m
diff --git a/third_party/protobuf/objectivec/google/protobuf/Empty.pbobjc.m b/third_party/protobuf/objectivec/google/protobuf/Empty.pbobjc.m
index 506b500e0490cfba4c2a9010d36cc7fbe5c24295..88753aaf4463f6ed81a4685c4c7ff762a41924e0 100644
--- a/third_party/protobuf/objectivec/google/protobuf/Empty.pbobjc.m
+++ b/third_party/protobuf/objectivec/google/protobuf/Empty.pbobjc.m
@@ -1,23 +1,8 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/protobuf/empty.proto
 
-// This CPP symbol can be defined to use imports that match up to the framework
-// imports needed when using CocoaPods.
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/GPBProtocolBuffers_RuntimeSupport.h>
-#else
- #import "GPBProtocolBuffers_RuntimeSupport.h"
-#endif
-
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
- #import <Protobuf/Empty.pbobjc.h>
-#else
- #import "google/protobuf/Empty.pbobjc.h"
-#endif
+#import "GPBProtocolBuffers_RuntimeSupport.h"
+#import "google/protobuf/Empty.pbobjc.h"
 // @@protoc_insertion_point(imports)
 
 #pragma clang diagnostic push
@@ -27,9 +12,6 @@
 
 @implementation GPBEmptyRoot
 
-// No extensions in the file and no imports, so no need to generate
-// +extensionRegistry.
-
 @end
 
 #pragma mark - GPBEmptyRoot_FileDescriptor
@@ -39,9 +21,8 @@ static GPBFileDescriptor *GPBEmptyRoot_FileDescriptor(void) {
   // about thread safety of the singleton.
   static GPBFileDescriptor *descriptor = NULL;
   if (!descriptor) {
-    GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
+    GPBDebugCheckRuntimeVersion();
     descriptor = [[GPBFileDescriptor alloc] initWithPackage:@"google.protobuf"
-                                                 objcPrefix:@"GPB"
                                                      syntax:GPBFileSyntaxProto3];
   }
   return descriptor;
@@ -68,7 +49,7 @@ typedef struct GPBEmpty__storage_ {
                                         fields:NULL
                                     fieldCount:0
                                    storageSize:sizeof(GPBEmpty__storage_)
-                                         flags:GPBDescriptorInitializationFlag_None];
+                                         flags:0];
     NSAssert(descriptor == nil, @"Startup recursed!");
     descriptor = localDescriptor;
   }