Merge branch 'master' of https://github.com/kripken/emscripten

1 files changed, 6 insertions, 0 deletions

diff --git a/src/jsifier.js b/src/jsifier.js
index cd59d43c..9c34ddf1 100644
--- a/src/jsifier.js
+++ b/src/jsifier.js
@@ -838,6 +838,12 @@ function JSify(data, functionsOnly, givenFunctions, givenGlobalVariables) {
       return makeSetValue(params[0].ident, 0, data, 'void*');
     } else if (ident == '_llvm_va_end') {
       return ';';
+    } else if (ident == '_EMSCRIPTEN_COMMENT') {
+      var param = finalizeParam(params[0]);
+      if (param.indexOf('CHECK_OVERFLOW') >= 0) {
+        param = param.split('(')[1].split(',')[0];
+      }
+      return '// ' + GLOBAL_VARIABLES[param].value.text.replace('\\00', '') + '   ';
     }
 
     var func = Functions.currFunctions[ident] || Functions.currExternalFunctions[ident];