Support use of parser and AST in C++ programs

Rename 'export' field of WasmModuleField because 'export' is a reserved
word in C++ (and regenerate the parser).
Wrap functions declared in wasm.h in extern "C"

1 files changed, 3 insertions, 1 deletions

diff --git a/src/wasm.h b/src/wasm.h
index 525f751f..fe4ca245 100644
--- a/src/wasm.h
+++ b/src/wasm.h
@@ -479,7 +479,7 @@ typedef struct WasmModuleField {
   union {
     WasmFunc func;
     WasmImport import;
-    WasmExport export;
+    WasmExport wasm_export;
     WasmVarVector table;
     WasmFuncType func_type;
     WasmMemory memory;
@@ -552,6 +552,7 @@ typedef struct WasmWriteBinaryOptions {
   int log_writes;
 } WasmWriteBinaryOptions;
 
+EXTERN_C_BEGIN
 WasmScanner wasm_new_scanner(const char* filename);
 void wasm_free_scanner(WasmScanner scanner);
 void wasm_error(WasmLocation*, WasmScanner, WasmParser*, const char*, ...);
@@ -602,5 +603,6 @@ WasmResult wasm_extend_type_bindings(WasmTypeBindings* dst,
                                      WasmTypeBindings* src) WARN_UNUSED;
 
 int wasm_func_is_exported(WasmModule* module, WasmFunc* func);
+EXTERN_C_END
 
 #endif /* WASM_H_ */