Merge branch 'master' of github.com:josephg/emscripten into incoming

2 files changed, 2 insertions, 1 deletions

diff --git a/AUTHORS b/AUTHORS
index 27206740..229a9cad 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -85,3 +85,4 @@ a license to everyone to use it as detailed in LICENSE.)
 * Ludovic Perrine <jazzzz@gmail.com>
 * David Barksdale <david.barksdale@adcedosolutions.com>
 * Manfred Manik Nerurkar <nerurkar*at*made-apps.biz> (copyright owned by MADE, GmbH)
+* Joseph Gentle <me@josephg.com>
diff --git a/src/library_browser.js b/src/library_browser.js
index d007d9a7..d9fd3ee5 100644
--- a/src/library_browser.js
+++ b/src/library_browser.js
@@ -805,7 +805,7 @@ mergeInto(LibraryManager.library, {
         var t = process['hrtime']();
         return t[0] * 1e3 + t[1] / 1e6;
     }
-    else if (window['performance'] && window['performance']['now']) {
+    else if (ENVIRONMENT_IS_WEB && window['performance'] && window['performance']['now']) {
       return window['performance']['now']();
     } else {
       return Date.now();