From 287ab94800c327f058770545b76039bd5186422a Mon Sep 17 00:00:00 2001
From: Joshua Haberman <jhaberman@gmail.com>
Date: Thu, 6 Sep 2018 13:16:11 -0700
Subject: A few more compile fixes.

---
 google/protobuf/descriptor.upb.c | 3 +++
 google/protobuf/descriptor.upb.h | 2 ++
 2 files changed, 5 insertions(+)

(limited to 'google')

diff --git a/google/protobuf/descriptor.upb.c b/google/protobuf/descriptor.upb.c
index 763fe3e..2a64717 100644
--- a/google/protobuf/descriptor.upb.c
+++ b/google/protobuf/descriptor.upb.c
@@ -10,6 +10,7 @@
 #include "upb/msg.h"
 #include "google/protobuf/descriptor.upb.h"
 
+#include "upb/port_def.inc"
 
 static const upb_msglayout *const google_protobuf_FileDescriptorSet_submsgs[1] = {
   &google_protobuf_FileDescriptorProto_msginit,
@@ -532,3 +533,5 @@ const upb_msglayout google_protobuf_GeneratedCodeInfo_Annotation_msginit = {
   UPB_SIZE(32, 48), 4, 0, false, true
 };
 
+#include "upb/port_undef.inc"
+
diff --git a/google/protobuf/descriptor.upb.h b/google/protobuf/descriptor.upb.h
index daa299d..07ce6f1 100644
--- a/google/protobuf/descriptor.upb.h
+++ b/google/protobuf/descriptor.upb.h
@@ -43,6 +43,7 @@ typedef struct google_protobuf_SourceCodeInfo { int a; } google_protobuf_SourceC
 typedef struct google_protobuf_SourceCodeInfo_Location { int a; } google_protobuf_SourceCodeInfo_Location;
 typedef struct google_protobuf_GeneratedCodeInfo { int a; } google_protobuf_GeneratedCodeInfo;
 typedef struct google_protobuf_GeneratedCodeInfo_Annotation { int a; } google_protobuf_GeneratedCodeInfo_Annotation;
+
 /* Enums */
 
 typedef enum {
@@ -800,6 +801,7 @@ UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_end(google_prot
 
 
 UPB_END_EXTERN_C
+
 #include "upb/port_undef.inc"
 
 #endif  /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ */
-- 
cgit v1.2.3