From d5d6b7284dea84b51c63bad5dd66756368575095 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Wed, 29 Jun 2022 13:23:58 +0900 Subject: [PATCH] Fix a few redefinition warnings for WAMR_BUILD_DEBUG_INTERP=1 (#1256) --- core/iwasm/libraries/debug-engine/debug_engine.h | 4 ++-- core/iwasm/libraries/thread-mgr/thread_manager.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/iwasm/libraries/debug-engine/debug_engine.h b/core/iwasm/libraries/debug-engine/debug_engine.h index 015f20d7..37d859ab 100644 --- a/core/iwasm/libraries/debug-engine/debug_engine.h +++ b/core/iwasm/libraries/debug-engine/debug_engine.h @@ -50,7 +50,7 @@ typedef struct WASMDebugExecutionMemory { uint32 current_pos; } WASMDebugExecutionMemory; -typedef struct WASMDebugInstance { +struct WASMDebugInstance { struct WASMDebugInstance *next; WASMDebugControlThread *control_thread; bh_list break_point_list; @@ -71,7 +71,7 @@ typedef struct WASMDebugInstance { * during creating debug instance, and use a simple bump pointer allocator * to serve lldb's memory request */ WASMDebugExecutionMemory exec_mem_info; -} WASMDebugInstance; +}; typedef enum WASMDebugEventKind { BREAK_POINT_ADD, diff --git a/core/iwasm/libraries/thread-mgr/thread_manager.h b/core/iwasm/libraries/thread-mgr/thread_manager.h index 18185105..c84d3c02 100644 --- a/core/iwasm/libraries/thread-mgr/thread_manager.h +++ b/core/iwasm/libraries/thread-mgr/thread_manager.h @@ -20,7 +20,7 @@ extern "C" { typedef struct WASMDebugInstance WASMDebugInstance; #endif -typedef struct WASMCluster { +struct WASMCluster { struct WASMCluster *next; korp_mutex lock; @@ -37,7 +37,7 @@ typedef struct WASMCluster { #if WASM_ENABLE_DEBUG_INTERP != 0 WASMDebugInstance *debug_inst; #endif -} WASMCluster; +}; void wasm_cluster_set_max_thread_num(uint32 num); @@ -151,11 +151,11 @@ wasm_cluster_spread_custom_data(WASMModuleInstanceCommon *module_inst, #define IS_WAMR_STOP_SIG(signo) \ ((signo) == WAMR_SIG_STOP || (signo) == WAMR_SIG_TRAP) -typedef struct WASMCurrentEnvStatus { +struct WASMCurrentEnvStatus { uint64 signal_flag : 32; uint64 step_count : 16; uint64 running_status : 16; -} WASMCurrentEnvStatus; +}; WASMCurrentEnvStatus * wasm_cluster_create_exenv_status();