diff options
| author | Jukka Jylänki <jujjyl@gmail.com> | 2014-05-08 15:08:28 +0300 |
|---|---|---|
| committer | Jukka Jylänki <jujjyl@gmail.com> | 2014-05-08 15:09:01 +0300 |
| commit | 82ecd38e7a518e1086d5db355522287d546dcbf7 (patch) | |
| tree | 5b67dec74f71267e03f4a7b93b85bea4102e8892 | |
| parent | ca8610ae8d1c1558dc4a6214a6ddb20b12c896db (diff) | |
Remove multiply defined symbol error on emscripten_get_now() at link time when including emscripten.h in native builds.
| -rw-r--r-- | system/include/emscripten/emscripten.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/include/emscripten/emscripten.h b/system/include/emscripten/emscripten.h index 362a1337..66017a8d 100644 --- a/system/include/emscripten/emscripten.h +++ b/system/include/emscripten/emscripten.h @@ -252,7 +252,7 @@ void emscripten_get_canvas_size(int *width, int *height, int *isFullscreen); double emscripten_get_now(void); #else #include <time.h> -double emscripten_get_now(void) { +static inline double emscripten_get_now(void) { return (1000*clock())/(double)CLOCKS_PER_SEC; } #endif |