Commit 377f7213 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

include: Add InterlockedOr().

parent aabdaed1
......@@ -1157,15 +1157,6 @@ static inline void spin_wait_for_next_rwl(rwl_queue *q)
SpinWait_dtor(&sw);
}
/* Remove when proper InterlockedOr implementation is added to wine */
static LONG InterlockedOr(LONG *d, LONG v)
{
LONG l;
while (~(l = *d) & v)
if (InterlockedCompareExchange(d, l|v, l) == l) break;
return l;
}
static LONG InterlockedAnd(LONG *d, LONG v)
{
LONG l = *d, old;
......
......@@ -6905,6 +6905,7 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask)
#pragma intrinsic(_InterlockedExchangeAdd)
#pragma intrinsic(_InterlockedIncrement)
#pragma intrinsic(_InterlockedDecrement)
#pragma intrinsic(_InterlockedOr)
long _InterlockedCompareExchange(long volatile*,long,long);
long long _InterlockedCompareExchange64(long long volatile*,long long,long long);
......@@ -6915,6 +6916,7 @@ long _InterlockedDecrement(long volatile*);
long _InterlockedExchange(long volatile*,long);
long _InterlockedExchangeAdd(long volatile*,long);
long _InterlockedIncrement(long volatile*);
long _InterlockedOr(long volatile *,long);
static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare )
{
......@@ -6953,6 +6955,11 @@ static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest )
return _InterlockedDecrement( (long volatile *)dest );
}
static FORCEINLINE LONG WINAPI InterlockedOr( LONG volatile *dest, LONG val )
{
return _InterlockedOr( (long volatile *)dest, val );
}
#ifndef __i386__
#pragma intrinsic(_InterlockedCompareExchangePointer)
......@@ -7056,6 +7063,11 @@ static FORCEINLINE void * WINAPI InterlockedExchangePointer( void *volatile *des
return ret;
}
static FORCEINLINE LONG WINAPI InterlockedOr( LONG volatile *dest, LONG val )
{
return __sync_fetch_and_or( dest, val );
}
#endif /* __GNUC__ */
#ifdef __cplusplus
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment