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.

---
 upbc/generator.cc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'upbc')

diff --git a/upbc/generator.cc b/upbc/generator.cc
index ddfaa7b..de40eee 100644
--- a/upbc/generator.cc
+++ b/upbc/generator.cc
@@ -502,7 +502,9 @@ void WriteHeader(const protobuf::FileDescriptor* file, Output& output) {
       "#include \"upb/decode.h\"\n"
       "#include \"upb/encode.h\"\n"
       "#include \"upb/port_def.inc\"\n"
-      "UPB_BEGIN_EXTERN_C\n\n",
+      "#ifdef __cplusplus\n"
+      "extern \"C\" {\n"
+      "#endif\n\n",
       ToPreproc(file->name()));
 
   // Forward-declare types defined in this file.
@@ -548,7 +550,9 @@ void WriteHeader(const protobuf::FileDescriptor* file, Output& output) {
   }
 
   output(
-      "UPB_END_EXTERN_C\n"
+      "#ifdef __cplusplus\n"
+      "}  /* extern \"C\" */\n"
+      "#endif\n"
       "\n"
       "#include \"upb/port_undef.inc\"\n"
       "\n"
-- 
cgit v1.2.3