Merge branch 'UPSTREAM'

1 files changed, 5 insertions, 8 deletions

diff --git a/common/atomic.c b/common/atomic.c
index 634587e4..3cdb77f4 100644
--- a/common/atomic.c
+++ b/common/atomic.c
@@ -4,13 +4,10 @@
 #include "atomic.h"
 
 
-extern inline void InitRef(volatile RefCount *ptr, uint value);
-extern inline uint ReadRef(volatile RefCount *ptr);
-extern inline uint IncrementRef(volatile RefCount *ptr);
-extern inline uint DecrementRef(volatile RefCount *ptr);
-extern inline uint ExchangeRef(volatile RefCount *ptr, uint newval);
-extern inline uint CompExchangeRef(volatile RefCount *ptr, uint oldval, uint newval);
+extern inline void InitRef(RefCount *ptr, uint value);
+extern inline uint ReadRef(RefCount *ptr);
+extern inline uint IncrementRef(RefCount *ptr);
+extern inline uint DecrementRef(RefCount *ptr);
+
 extern inline int ExchangeInt(volatile int *ptr, int newval);
 extern inline void *ExchangePtr(XchgPtr *ptr, void *newval);
-extern inline int CompExchangeInt(volatile int *ptr, int oldval, int newval);
-extern inline void *CompExchangePtr(XchgPtr *ptr, void *oldval, void *newval);