diff options
| author | Christian Nieves <christian@nieves.io> | 2024-07-16 11:51:15 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-16 09:51:15 -0700 |
| commit | ed1ce97eef41c598befa962aa97624f5c5b034cf (patch) | |
| tree | 72e854065ad593d16ca6fcadba7ef955af36d688 | |
| parent | 5d999f051238cb249a3bc80f23f68d2a55c01e96 (diff) | |
| download | wabt-ed1ce97eef41c598befa962aa97624f5c5b034cf.tar.gz wabt-ed1ce97eef41c598befa962aa97624f5c5b034cf.tar.bz2 wabt-ed1ce97eef41c598befa962aa97624f5c5b034cf.zip | |
Fix macro redefinition error when building wasm_rt w/ Android NDK (#2437)
| -rw-r--r-- | wasm2c/wasm-rt-mem-impl-helper.inc | 8 | ||||
| -rw-r--r-- | wasm2c/wasm-rt-mem-impl.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/wasm2c/wasm-rt-mem-impl-helper.inc b/wasm2c/wasm-rt-mem-impl-helper.inc index 59bfe712..2c2f9b75 100644 --- a/wasm2c/wasm-rt-mem-impl-helper.inc +++ b/wasm2c/wasm-rt-mem-impl-helper.inc @@ -67,7 +67,7 @@ void MEMORY_API_NAME(wasm_rt_allocate_memory)(MEMORY_TYPE* memory, uint64_t initial_pages, uint64_t max_pages, bool is64) { - uint64_t byte_length = initial_pages * PAGE_SIZE; + uint64_t byte_length = initial_pages * WASM_PAGE_SIZE; memory->size = byte_length; memory->pages = initial_pages; memory->max_pages = max_pages; @@ -103,9 +103,9 @@ static uint64_t MEMORY_API_NAME(grow_memory_impl)(MEMORY_TYPE* memory, if (new_pages < old_pages || new_pages > memory->max_pages) { return (uint64_t)-1; } - uint64_t old_size = old_pages * PAGE_SIZE; - uint64_t new_size = new_pages * PAGE_SIZE; - uint64_t delta_size = delta * PAGE_SIZE; + uint64_t old_size = old_pages * WASM_PAGE_SIZE; + uint64_t new_size = new_pages * WASM_PAGE_SIZE; + uint64_t delta_size = delta * WASM_PAGE_SIZE; #if WASM_RT_USE_MMAP MEMORY_CELL_TYPE new_data = memory->data; int ret = os_mprotect((void*)(new_data + old_size), delta_size); diff --git a/wasm2c/wasm-rt-mem-impl.c b/wasm2c/wasm-rt-mem-impl.c index d29aadad..0f22b25b 100644 --- a/wasm2c/wasm-rt-mem-impl.c +++ b/wasm2c/wasm-rt-mem-impl.c @@ -25,7 +25,7 @@ #include <sys/mman.h> #endif -#define PAGE_SIZE 65536 +#define WASM_PAGE_SIZE 65536 #ifdef WASM_RT_GROW_FAILED_HANDLER extern void WASM_RT_GROW_FAILED_HANDLER(); @@ -144,7 +144,7 @@ static uint64_t get_alloc_size_for_mmap(uint64_t max_pages, bool is64) { return max_size; #else if (max_pages != 0) { - const uint64_t max_size = max_pages * PAGE_SIZE; + const uint64_t max_size = max_pages * WASM_PAGE_SIZE; return max_size; } @@ -175,4 +175,4 @@ static uint64_t get_alloc_size_for_mmap(uint64_t max_pages, bool is64) { #undef WIN_MEMORY_LOCK_VAR_INIT #undef WIN_MEMORY_LOCK_AQUIRE #undef WIN_MEMORY_LOCK_RELEASE -#undef PAGE_SIZE +#undef WASM_PAGE_SIZE |