diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-07-01 11:16:04 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-07-01 11:16:04 -0700 |
| commit | 6fe5cf7d33f63d0c73e544d0d2c783e60e8d52fc (patch) | |
| tree | 9979aa295ce6788e20f0915f0d2c950d16b788f5 /src | |
| parent | 4fc8717d8549de46437921107999fd4df7c15be1 (diff) | |
| parent | dfa647039a59bb8ba34e690832f77c6dfeaeed57 (diff) | |
Merge branch 'master' of github.com:josephg/emscripten into incoming
Diffstat (limited to 'src')
| -rw-r--r-- | src/library_browser.js | 2 |
1 files changed, 1 insertions, 1 deletions
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(); |