cml/libcm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmThread.c : Changed cmThPtrCAS() to select the CAS system call based on

Browse Source 
OS_64 when compiling under OSX.  This allows backward compatibility with older
version of OSX.
This commit is contained in:
kevin 2013-10-16 08:58:46 -07:00
parent 5307482f6e
commit cb19fb10a2
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmThread.c
View File

@ -1302,7 +1302,11 @@ bool cmThPtrCAS( void* addr, void* old, void* neww )
union union
{ {
void* addr; void* addr;
#ifdef OS_64
int64_t val; int64_t val;
#else
int val;
#endif
} u; } u;
} s_t; } s_t;
@ -1310,10 +1314,11 @@ bool cmThPtrCAS( void* addr, void* old, void* neww )
ov.u.addr = old; ov.u.addr = old;
nv.u.addr = neww; nv.u.addr = neww;
#ifdef OS_64
int rv = OSAtomicCompareAndSwap64Barrier(ov.u.val,nv.u.val,(int64_t*)addr); int rv = OSAtomicCompareAndSwap64Barrier(ov.u.val,nv.u.val,(int64_t*)addr);
#else
//int rv = OSAtomicCompareAndSwapPtrBarrier(old,neww,&addr); int rv = OSAtomicCompareAndSwap32Barrier(ov.u.val,nv.u.val,(int*)addr);
#endif
return rv; return rv;
#endif #endif