diff options
| author | Ehsan Akhgari <ehsan@mozilla.com> | 2014-06-24 10:25:30 -0700 |
|---|---|---|
| committer | Ehsan Akhgari <ehsan@mozilla.com> | 2014-06-24 10:25:30 -0700 |
| commit | 6e659ad7eedec1af9c046b853e36b38a39d57cdd (patch) | |
| tree | 2aba4e898cbda3d1275ad704d18698fd5e4bd4eb | |
| parent | 67738854685f1f00debba856ee34c37ba10e90a9 (diff) | |
| download | nspr-hg-NSPR_4_10_7_BETA2.tar.gz | |
Bug 1026129: Replace some manual declarations of MSVC intrinsics withNSPR_4_10_7_BETA2
#include <intrin.h>. r=wtc.
| -rw-r--r-- | pr/include/pratom.h | 5 | ||||
| -rw-r--r-- | pr/include/prbit.h | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/pr/include/pratom.h b/pr/include/pratom.h index 3b2fe5c6..9dbe0fad 100644 --- a/pr/include/pratom.h +++ b/pr/include/pratom.h @@ -81,10 +81,7 @@ NSPR_API(PRInt32) PR_AtomicAdd(PRInt32 *ptr, PRInt32 val); #if defined(_WIN32) && !defined(_WIN32_WCE) && \ (!defined(_MSC_VER) || (_MSC_VER >= 1310)) -long __cdecl _InterlockedIncrement(long volatile *Addend); -long __cdecl _InterlockedDecrement(long volatile *Addend); -long __cdecl _InterlockedExchange(long volatile *Target, long Value); -long __cdecl _InterlockedExchangeAdd(long volatile *Addend, long Value); +#include <intrin.h> #ifdef _MSC_VER #pragma intrinsic(_InterlockedIncrement) diff --git a/pr/include/prbit.h b/pr/include/prbit.h index de837508..0434fc68 100644 --- a/pr/include/prbit.h +++ b/pr/include/prbit.h @@ -15,8 +15,7 @@ PR_BEGIN_EXTERN_C */ #if defined(_WIN32) && (_MSC_VER >= 1300) && \ (defined(_M_IX86) || defined(_M_AMD64) || defined(_M_ARM)) - unsigned char _BitScanForward(unsigned long * Index, unsigned long Mask); - unsigned char _BitScanReverse(unsigned long * Index, unsigned long Mask); +# include <intrin.h> # pragma intrinsic(_BitScanForward,_BitScanReverse) __forceinline static int __prBitScanForward32(unsigned int val) { |