Merge branch 'incoming' of https://github.com/kripken/emscripten into fixed_openal_buffers

Conflicts:
	src/library_openal.js

1 files changed, 7 insertions, 0 deletions

diff --git a/src/preamble.js b/src/preamble.js
index 95bf2dc2..0f3f52c9 100644
--- a/src/preamble.js
+++ b/src/preamble.js
@@ -853,6 +853,13 @@ Math['imul'] = function(a, b) {
 #endif
 Math.imul = Math['imul'];
 
+#if TO_FLOAT32
+if (!Math['toFloat32']) Math['toFloat32'] = function(x) {
+  return x;
+};
+Math.toFloat32 = Math['toFloat32'];
+#endif
+
 // A counter of dependencies for calling run(). If we need to
 // do asynchronous work before running, increment this and
 // decrement it. Incrementing must happen in a place like