Avoid redefining WASMMemoryType#3602
Merged
wenyongh merged 1 commit intobytecodealliance:mainfrom Jul 10, 2024
Merged
Conversation
wenyongh
approved these changes
Jul 8, 2024
bnason-nf
added a commit
to bnason-nf/wasm-micro-runtime
that referenced
this pull request
Jul 11, 2024
# By Benbuck Nason (2) and others # Via GitHub * upstream/main: wasm loader: Reject v128 for interpreters (bytecodealliance#3611) Fix typos in wamrc and wasm_export.h (bytecodealliance#3609) Bump ocaml/setup-ocaml from 2 to 3 (bytecodealliance#3604) Add wasm_runtime_get_module_package_type() and wasm_runtime_get_file_package_type() (bytecodealliance#3600) Avoid redefining WASMMemoryType (bytecodealliance#3602) # Conflicts: # core/iwasm/common/wasm_runtime_common.c # core/iwasm/include/wasm_export.h
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
No description provided.