Merge branch 'NiCoX' of github.com:patchanka/emscripten into incoming

Conflicts:
	AUTHORS

2 files changed, 4 insertions, 2 deletions

diff --git a/AUTHORS b/AUTHORS
index 6b548922..6aed0236 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -127,3 +127,5 @@ a license to everyone to use it as detailed in LICENSE.)
 * Richard Janicek <r@janicek.co>
 * Joel Croteau <jcroteau@gmail.com>
 * Haneef Mubarak <haneef503@gmail.com>
+* Nicolas Peri <nicox@shivaengine.com> (copyright owned by ShiVa Technologies, SAS)
+
diff --git a/src/library_openal.js b/src/library_openal.js
index ac49fe95..bdbb2dca 100644
--- a/src/library_openal.js
+++ b/src/library_openal.js
@@ -174,8 +174,8 @@ var LibraryOpenAL = {
   },
 
   alcOpenDevice: function(deviceName) {
-    if (typeof(AudioContext) == "function" ||
-        typeof(webkitAudioContext) == "function") {
+    if (typeof(AudioContext) !== "undefined" ||
+        typeof(webkitAudioContext) !== "undefined") {
       return 1; // non-null pointer -- we just simulate one device
     } else {
       return 0;