From 915adc433db184f59df5553393c420978ac86d60 Mon Sep 17 00:00:00 2001 From: Huang Qi Date: Tue, 16 Jan 2024 08:53:18 +0800 Subject: [PATCH] Rename rwlock_init to avoid conflict (#3016) This symbol is too simple to cause conflict with others, such as the RW spinlock in Linux kernel and NuttX, so rename it to avoid the conflict. --- .../libc-wasi/sandboxed-system-primitives/src/locking.h | 2 +- .../libc-wasi/sandboxed-system-primitives/src/posix.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/iwasm/libraries/libc-wasi/sandboxed-system-primitives/src/locking.h b/core/iwasm/libraries/libc-wasi/sandboxed-system-primitives/src/locking.h index 5e0778c3f..0ad40ecfd 100644 --- a/core/iwasm/libraries/libc-wasi/sandboxed-system-primitives/src/locking.h +++ b/core/iwasm/libraries/libc-wasi/sandboxed-system-primitives/src/locking.h @@ -88,7 +88,7 @@ struct LOCKABLE rwlock { }; static inline bool -rwlock_init(struct rwlock *lock) REQUIRES_UNLOCKED(*lock) +rwlock_initialize(struct rwlock *lock) REQUIRES_UNLOCKED(*lock) { return os_rwlock_init(&lock->object) == 0 ? true : false; } diff --git a/core/iwasm/libraries/libc-wasi/sandboxed-system-primitives/src/posix.c b/core/iwasm/libraries/libc-wasi/sandboxed-system-primitives/src/posix.c index 9819c92fd..d24d49393 100644 --- a/core/iwasm/libraries/libc-wasi/sandboxed-system-primitives/src/posix.c +++ b/core/iwasm/libraries/libc-wasi/sandboxed-system-primitives/src/posix.c @@ -204,7 +204,7 @@ struct fd_prestat { bool fd_prestats_init(struct fd_prestats *pt) { - if (!rwlock_init(&pt->lock)) + if (!rwlock_initialize(&pt->lock)) return false; pt->prestats = NULL; pt->size = 0; @@ -340,7 +340,7 @@ struct fd_entry { bool fd_table_init(struct fd_table *ft) { - if (!rwlock_init(&ft->lock)) + if (!rwlock_initialize(&ft->lock)) return false; ft->entries = NULL; ft->size = 0;