Merge pull request #296 from ethereum/emscripten-addfunction

Support multiple versions of Emscripten (module.Runtime.addFunction vs. module.addFunction)
ethereum · Nov 14, 2018 · eace963 · eace963
2 parents f617301 + 714162e
commit eace963
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/wrapper.js b/wrapper.js
@@ -34,16 +34,21 @@ function setupMethods (soljson) {
         };
       };
     }
-    var cb = soljson.Runtime.addFunction(wrapCallback(readCallback));
+
+    // This is to support multiple versions of Emscripten.
+    var addFunction = soljson.addFunction || soljson.Runtime.addFunction;
+    var removeFunction = soljson.removeFunction || soljson.Runtime.removeFunction;
+
+    var cb = addFunction(wrapCallback(readCallback));
     var output;
     try {
       args.push(cb);
       output = compile.apply(undefined, args);
     } catch (e) {
-      soljson.Runtime.removeFunction(cb);
+      removeFunction(cb);
       throw e;
     }
-    soljson.Runtime.removeFunction(cb);
+    removeFunction(cb);
     return output;
   };