From cb26d883d1290ed258e5594454c2ffe0526b13f9 Mon Sep 17 00:00:00 2001
From: Joshua Haberman <jhaberman@gmail.com>
Date: Mon, 14 Jan 2019 10:56:58 -0800
Subject: WIP.

---
 google/protobuf/descriptor.upb.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'google')

diff --git a/google/protobuf/descriptor.upb.h b/google/protobuf/descriptor.upb.h
index 32bccc7..7e62be5 100644
--- a/google/protobuf/descriptor.upb.h
+++ b/google/protobuf/descriptor.upb.h
@@ -16,7 +16,9 @@
 #include "upb/decode.h"
 #include "upb/encode.h"
 #include "upb/port_def.inc"
-UPB_BEGIN_EXTERN_C
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 struct google_protobuf_FileDescriptorSet;
 struct google_protobuf_FileDescriptorProto;
@@ -1668,7 +1670,9 @@ UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_end(google_prot
 }
 
 
-UPB_END_EXTERN_C
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
 
 #include "upb/port_undef.inc"
 
-- 
cgit v1.2.3