Merge pull request #199 from veblush/upb_alloc_global

Add extern C to upb_alloc_global
6 years ago · 7e7cb5f831
parent 94d74ce700 98ae7806e9
commit 7e7cb5f831
1 changed files with 8 additions and 0 deletions
--- a/upb/upb.h
+++ b/upb/upb.h
@ -159,8 +159,16 @@ UPB_INLINE void upb_free(upb_alloc *alloc, void *ptr) {

 /* The global allocator used by upb.  Uses the standard malloc()/free(). */

+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern upb_alloc upb_alloc_global;

+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
 /* Functions that hard-code the global malloc.
 *
 * We still get benefit because we can put custom logic into our global