OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

spinlock: add __cplusplus check to avoid build break with C++ 

stdatomic.h is incompatible with C++

Signed-off-by: chao an <anchao@xiaomi.com>
This commit is contained in:
chao an 2023-11-12 21:50:20 +08:00 committed by Xiang Xiao
parent 3b2c585ab7
commit 74d698f439
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
include/nuttx/spinlock.h
View File

@ -32,12 +32,21 @@
#include <nuttx/irq.h> #include <nuttx/irq.h>
#ifdef CONFIG_RW_SPINLOCK #undef EXTERN
#include <stdatomic.h> #if defined(__cplusplus)
#define EXTERN extern "C"
extern "C"
{
#else
#define EXTERN extern
#endif
#if defined(CONFIG_RW_SPINLOCK) && !defined(__cplusplus)
# include <stdatomic.h>
typedef atomic_int rwlock_t; typedef atomic_int rwlock_t;
#define RW_SP_UNLOCKED 0 # define RW_SP_UNLOCKED 0
#define RW_SP_READ_LOCKED 1 # define RW_SP_READ_LOCKED 1
#define RW_SP_WRITE_LOCKED -1 # define RW_SP_WRITE_LOCKED -1
#endif #endif
#ifndef CONFIG_SPINLOCK #ifndef CONFIG_SPINLOCK
@ -500,7 +509,7 @@ void spin_unlock_irqrestore_wo_note(FAR spinlock_t *lock, irqstate_t flags);
# define spin_unlock_irqrestore_wo_note(l, f) up_irq_restore(f) # define spin_unlock_irqrestore_wo_note(l, f) up_irq_restore(f)
#endif #endif
#ifdef CONFIG_RW_SPINLOCK #if defined(CONFIG_RW_SPINLOCK) && !defined(__cplusplus)
/**************************************************************************** /****************************************************************************
* Name: rwlock_init * Name: rwlock_init
@ -808,5 +817,11 @@ void write_unlock_irqrestore(FAR rwlock_t *lock, irqstate_t flags);
# define write_unlock_irqrestore(l, f) up_irq_restore(f) # define write_unlock_irqrestore(l, f) up_irq_restore(f)
#endif #endif
#endif /* CONFIG_RW_SPINLOCK */ #endif /* CONFIG_RW_SPINLOCK && !__cplusplus */
#undef EXTERN
#if defined(__cplusplus)
}
#endif
#endif /* __INCLUDE_NUTTX_SPINLOCK_H */ #endif /* __INCLUDE_NUTTX_SPINLOCK_H */