Generate C preprocessor code to hide things not on Windows #952
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
MarkMcCaskey
force-pushed
the
feature/hide-trampoline-c-api-on-windows
branch
from
1f9de1b to
e121c47
Compare
nlewycky
reviewed
Nov 11, 2019
| @@ -612,32 +635,46 @@ uint32_t wasmer_table_length(wasmer_table_t *table); | |||
| /// and `wasmer_last_error_message` to get an error message. | |||
| wasmer_result_t wasmer_table_new(wasmer_table_t **table, wasmer_limits_t limits); | |||
|
|
|||
| #if (!defined(_WIN32) && defined(ARCH_X86_64)) | |||
There was a problem hiding this comment.
Optional: these are clearly a group, just put a single #if around them to disable all these related trampoline functions for windows?
There was a problem hiding this comment.
Yeah, it's unfortunate that it did that; if we manually edit the header file though then we have to do it after every time it's generated
There was a problem hiding this comment.
I put it at the top level in Rust
nlewycky
approved these changes
Nov 11, 2019
|
bors r+ |
bors bot
added a commit
that referenced
this pull request
Nov 11, 2019
952: Generate C preprocessor code to hide things not on Windows r=MarkMcCaskey a=MarkMcCaskey resolves #804 # Review - [x] Add a short description of the the change to the CHANGELOG.md file Co-authored-by: Mark McCaskey <[email protected]> Co-authored-by: nlewycky <[email protected]>
Build succeeded
|
Hywan
referenced
this pull request
in wasmerio/wasmer-go
Nov 14, 2019
This patch updates the runtime to 0.10.1. It includes this bug fix wasmerio/wasmer#960.
bors bot
added a commit
that referenced
this pull request
Nov 14, 2019
960: feat(runtime-c-api) Add support for clang in `WASMER_H_MACROS` r=MarkMcCaskey a=Hywan In #952, the `WASMER_H_MACROS` constant has been defined. The `ARCH_X86_64` constant is defined under 2 conditions: If the compiler is MSVC + `_M_AMD64` is defined, or if the compiler is GCC + `__x86_64__` is defined. Clang is missing. And it breaks some projects (like https://github.com/wasmerio/php-ext-wasm or https://github.com/wasmerio/go-ext-wasm for instance). This patch supports Clang. Co-authored-by: Ivan Enderlin <[email protected]>
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.
resolves #804
Review