1 files changed, 6 insertions, 2 deletions
diff --git a/upb/encode.h b/upb/encode.h
index 1a451b0..6842777 100644
--- a/upb/encode.h
+++ b/upb/encode.h
@@ -7,11 +7,15 @@
 
 #include "upb/msg.h"
 
-UPB_BEGIN_EXTERN_C
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 char *upb_encode(const void *msg, const upb_msglayout *l, upb_arena *arena,
                  size_t *size);
 
-UPB_END_EXTERN_C
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
 
 #endif  /* UPB_ENCODE_H_ */