fix emscripten now method #33
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
this fixes rapier upstream running via emscripten: dimforge/rapier#207 |
sebcrozet
requested changes
Jun 27, 2021
src/wasm.rs
Outdated
Comment on lines
129
to
144
| #[cfg(not(target_os = "emscripten"))] | ||
| mod js { | ||
| extern "C" { | ||
| pub fn now() -> f64; | ||
| } | ||
| } | ||
| // Make the unsafe extern function "safe" so it can be called like the other 'now' functions | ||
| #[cfg(not(any(feature = "wasm-bindgen", feature = "stdweb")))] | ||
| #[cfg(not(target_os = "emscripten"))] | ||
| pub fn now() -> f64 { | ||
| unsafe { js::now() } | ||
| } | ||
|
|
||
| #[cfg(not(any(feature = "wasm-bindgen", feature = "stdweb")))] | ||
| #[cfg(target_os = "emscripten")] | ||
| mod js { | ||
| extern "C" { | ||
| pub fn _emscripten_get_now() -> f64; | ||
| } | ||
| } | ||
| // Make the unsafe extern function "safe" so it can be called like the other 'now' functions | ||
| #[cfg(not(any(feature = "wasm-bindgen", feature = "stdweb")))] | ||
| #[cfg(target_os = "emscripten")] | ||
| pub fn now() -> f64 { | ||
| unsafe { js::_emscripten_get_now() } | ||
| } |
There was a problem hiding this comment.
I think this can be more consise:
mod js {
extern "C" {
#[cfg(not(target_os = "emscripten"))]
pub fn now() -> f64;
#[cfg(target_os = "emscripten")]
pub fn _emscripten_get_now() -> f64;
}
}
// Make the unsafe extern function "safe" so it can be called like the other 'now' functions
#[cfg(not(any(feature = "wasm-bindgen", feature = "stdweb")))]
pub fn now() -> f64 {
#[cfg(not(target_os = "emscripten"))]
return unsafe { js::now() };
#[cfg(target_os = "emscripten")]
return unsafe { js::_emscripten_get_now() };
}
extrawurst
force-pushed
the
emscripten-fix
branch
2 times, most recently
from
8a6117c
to
671a8de
Compare
sebcrozet
approved these changes
Jun 27, 2021
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
see https://github.com/emscripten-core/emscripten/blob/main/system/include/emscripten/emscripten.h#L85