Fix some comments and bump EMSCRIPTEN_VERSION

4 files changed, 4 insertions, 11 deletions

diff --git a/src/compiler.js b/src/compiler.js
index 69824035..f7c6dd59 100644
--- a/src/compiler.js
+++ b/src/compiler.js
@@ -207,7 +207,6 @@ if (VERBOSE) printErr('VERBOSE is on, this generates a lot of output and can slo
 // Load struct and define information.
 var temp = JSON.parse(read(STRUCT_INFO));
 C_STRUCTS = temp.structs;
-// NOTE: This overwrites C_DEFINES from settings.js, should this be fixed or will C_DEFINES in settings.js be deprecated?
 C_DEFINES = temp.defines;
 
 // Load compiler code
diff --git a/src/settings.js b/src/settings.js
index 8d9d4634..8cdf420c 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -438,13 +438,7 @@ var DEBUG_TAGS_SHOWING = [];
   //    metadata
   //    legalizer
 
-// A cached set of defines, generated from the header files. This
-// lets the emscripten libc (library.js) see the right values.
-// The list of defines was moved into struct_info.json in the same directory.
+// The list of defines (C_DEFINES) was moved into struct_info.json in the same directory.
 // That file is automatically parsed by tools/gen_struct_info.py.
 // If you modify the headers, just clear your cache and emscripten libc should see
 // the new values.
-// NOTE: Right now this value is ignored.
-// TODO: See compiler.js (Should this var be deprecated?)
-var C_DEFINES = {};
-
diff --git a/tools/gen_struct_info.py b/tools/gen_struct_info.py
index 6c479747..aab128eb 100644
--- a/tools/gen_struct_info.py
+++ b/tools/gen_struct_info.py
@@ -37,7 +37,7 @@ The JSON input format is as follows:
     'defines': [
       'DEFINE_1',
       'DEFINE_2',
-      ['li', 'FLOAT_DEFINE'],
+      ['f', 'FLOAT_DEFINE'],
       'DEFINE_3',
       ...
     ]
@@ -92,7 +92,7 @@ except ImportError:
   show('WARN: pycparser isn\'t available. I won\'t be able to parse C files, only .json files.')
   
   def parse_header(path, cpp_opts):
-    # Tell the user how to get pycparser, if he tries to parse a C file.
+    # Tell the user how to get pycparser, if he or she tries to parse a C file.
     sys.stderr.write('ERR: I need pycparser to process C files. \n')
     sys.stderr.write('   Use "pip install pycparser" to install or download it from "https://github.com/eliben/pycparser".\n')
     sys.exit(1)
diff --git a/tools/shared.py b/tools/shared.py
index 554813ee..53f83185 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -304,7 +304,7 @@ def find_temp_directory():
 # we re-check sanity when the settings are changed)
 # We also re-check sanity and clear the cache when the version changes
 
-EMSCRIPTEN_VERSION = '1.5.9'
+EMSCRIPTEN_VERSION = '1.5.10'
 
 def generate_sanity():
   return EMSCRIPTEN_VERSION + '|' + get_llvm_target() + '|' + LLVM_ROOT