From c5cd7365014e6466036482c8db9e648a08eef1c3 Mon Sep 17 00:00:00 2001
From: Vova <vshymanskyi@gmail.com>
Date: Wed, 29 Dec 2021 14:47:56 +0200
Subject: [PATCH] Fix decls in decls.h + add exported definitions to inits.c

---
 c.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/c.c b/c.c
index e357bab6..8eaffbad 100644
--- a/c.c
+++ b/c.c
@@ -3035,11 +3035,15 @@ wasmCWriteFunctionExport(
     const WasmModule* module,
     WasmExport export,
     WasmFunction function,
+    bool external,
     bool pretty
 ) {
     const WasmFunctionType functionType =
         module->functionTypes.functionTypes[function.functionTypeIndex];
 
+    if (external) {
+        fputs("extern ", file);
+    }
     fputs(wasmCGetReturnType(functionType), file);
     fputs(" (*", file);
     wasmCWriteExportName(file, export.name);
@@ -3052,8 +3056,12 @@ static
 void
 wasmCWriteMemoryExport(
     FILE* file,
-    WasmExport export
+    WasmExport export,
+    bool external
 ) {
+    if (external) {
+        fputs("extern ", file);
+    }
     fputs("wasmMemory (*", file);
     wasmCWriteExportName(file, export.name);
     fputs(");\n\n", file);
@@ -3064,7 +3072,8 @@ void
 wasmCWriteExports(
     FILE* file,
     const WasmModule* module,
-    bool pretty
+    bool pretty,
+    bool external
 ) {
     U32 exportIndex = 0;
     for (; exportIndex < module->exports.count; exportIndex++) {
@@ -3074,11 +3083,11 @@ wasmCWriteExports(
                 U32 functionImportCount = module->functionImports.length;
                 U32 functionIndex = export.index - functionImportCount;
                 const WasmFunction function = module->functions.functions[functionIndex];
-                wasmCWriteFunctionExport(file, module, export, function, pretty);
+                wasmCWriteFunctionExport(file, module, export, function, external, pretty);
                 break;
             }
             case wasmExportKindMemory: {
-                wasmCWriteMemoryExport(file, export);
+                wasmCWriteMemoryExport(file, export, external);
                 break;
             }
 
@@ -3096,6 +3105,8 @@ wasmCWriteInitExports(
 ) {
     U32 exportIndex = 0;
 
+    wasmCWriteExports(file, module, pretty, false);
+
     fputs("static void initExports(void) {\n", file);
 
     for (; exportIndex < module->exports.count; exportIndex++) {
@@ -3384,7 +3395,7 @@ wasmCWriteModuleDeclarations(
     wasmCWriteGlobalImports(file, module);
     wasmCWriteGlobals(file, module, keyword);
 
-    wasmCWriteExports(file, module, pretty);
+    wasmCWriteExports(file, module, pretty, true);
 }
 
 static