File 1111-Make-header-files-possible-to-include-in-C... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1111-Make-header-files-possible-to-include-in-C-source-fi.patch of Package erlang (Revision 218b3430555ecf8dc51659dea4ccdb8e)

Currently displaying revision 218b3430555ecf8dc51659dea4ccdb8e , Show latest

From 925230cfc7e985783e5f3cac38964b2809457a3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Fri, 12 Mar 2021 12:50:07 +0100
Subject: [PATCH 11/20] Make header files possible to include in C++ source
 files

---
 erts/include/internal/gcc/ethr_atomic.h    | 8 ++++----
 erts/include/internal/gcc/ethr_dw_atomic.h | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/erts/include/internal/gcc/ethr_atomic.h b/erts/include/internal/gcc/ethr_atomic.h
index 3ef042ce61..eb6b4fb286 100644
--- a/erts/include/internal/gcc/ethr_atomic.h
+++ b/erts/include/internal/gcc/ethr_atomic.h
@@ -496,13 +496,13 @@ ETHR_NATMC_FUNC__(or_retold_mb)(ETHR_ATMC_T__ *var, ETHR_AINT_T__ mask)
 
 static ETHR_INLINE ETHR_AINT_T__
 ETHR_NATMC_FUNC__(cmpxchg)(ETHR_ATMC_T__ *var,
-			   ETHR_AINT_T__ new,
+			   ETHR_AINT_T__ new_val,
 			   ETHR_AINT_T__ exp)
 {
     ETHR_AINT_T__ xchg = exp;
     if (__atomic_compare_exchange_n(&var->value,
 				    &xchg,
-				    new,
+				    new_val,
 				    0, /* No spurious failures, please */
 				    __ATOMIC_RELAXED,
 				    __ATOMIC_RELAXED))
@@ -522,13 +522,13 @@ ETHR_NATMC_FUNC__(cmpxchg)(ETHR_ATMC_T__ *var,
 
 static ETHR_INLINE ETHR_AINT_T__
 ETHR_NATMC_FUNC__(cmpxchg_acqb)(ETHR_ATMC_T__ *var,
-				ETHR_AINT_T__ new,
+				ETHR_AINT_T__ new_val,
 				ETHR_AINT_T__ exp)
 {
     ETHR_AINT_T__ xchg = exp;
     if (__atomic_compare_exchange_n(&var->value,
 				    &xchg,
-				    new,
+				    new_val,
 				    0, /* No spurious failures, please */
 				    __ATOMIC_ACQUIRE,
 				    __ATOMIC_ACQUIRE))
diff --git a/erts/include/internal/gcc/ethr_dw_atomic.h b/erts/include/internal/gcc/ethr_dw_atomic.h
index 69cf6cd3f3..d661bf33fb 100644
--- a/erts/include/internal/gcc/ethr_dw_atomic.h
+++ b/erts/include/internal/gcc/ethr_dw_atomic.h
@@ -178,7 +178,7 @@ ethr_native_su_dw_atomic_read_acqb(ethr_native_dw_atomic_t *var)
 
 static ETHR_INLINE ETHR_NATIVE_SU_DW_SINT_T
 ethr_native_su_dw_atomic_cmpxchg(ethr_native_dw_atomic_t *var,
-				 ETHR_NATIVE_SU_DW_SINT_T new,
+				 ETHR_NATIVE_SU_DW_SINT_T new_val,
 				 ETHR_NATIVE_SU_DW_SINT_T exp)
 {
     ethr_native_dw_ptr_t p = (ethr_native_dw_ptr_t) ETHR_DW_NATMC_MEM__(var);
@@ -186,7 +186,7 @@ ethr_native_su_dw_atomic_cmpxchg(ethr_native_dw_atomic_t *var,
     ETHR_DW_DBG_ALIGNED__(p);
     if (__atomic_compare_exchange_n(p,
 				    &xchg,
-				    new,
+				    new_val,
 				    0,
 				    __ATOMIC_RELAXED,
 				    __ATOMIC_RELAXED))
@@ -202,7 +202,7 @@ ethr_native_su_dw_atomic_cmpxchg(ethr_native_dw_atomic_t *var,
 
 static ETHR_INLINE ETHR_NATIVE_SU_DW_SINT_T
 ethr_native_su_dw_atomic_cmpxchg_acqb(ethr_native_dw_atomic_t *var,
-				      ETHR_NATIVE_SU_DW_SINT_T new,
+				      ETHR_NATIVE_SU_DW_SINT_T new_val,
 				      ETHR_NATIVE_SU_DW_SINT_T exp)
 {
     ethr_native_dw_ptr_t p = (ethr_native_dw_ptr_t) ETHR_DW_NATMC_MEM__(var);
@@ -210,7 +210,7 @@ ethr_native_su_dw_atomic_cmpxchg_acqb(ethr_native_dw_atomic_t *var,
     ETHR_DW_DBG_ALIGNED__(p);
     if (__atomic_compare_exchange_n(p,
 				    &xchg,
-				    new,
+				    new_val,
 				    0,
 				    __ATOMIC_ACQUIRE,
 				    __ATOMIC_ACQUIRE))
-- 
2.26.2

Places

File 1111-Make-header-files-possible-to-include-in-C-source-fi.patch of Package erlang (Revision 218b3430555ecf8dc51659dea4ccdb8e)

Places