Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Unified Diff: nspr/pr/include/pratom.h

Issue 407383002: Update to NSPR 4.10.7 Beta 3. (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/nss
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « nspr/pr/include/md/_linux.cfg ('k') | nspr/pr/include/prbit.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: nspr/pr/include/pratom.h
diff --git a/nspr/pr/include/pratom.h b/nspr/pr/include/pratom.h
index 5846bd3813de22e153379ed595b0546967c92bac..9dbe0fad33930daacefeb621149a34d0115e8ded 100644
--- a/nspr/pr/include/pratom.h
+++ b/nspr/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)
@@ -107,7 +104,7 @@ long __cdecl _InterlockedExchangeAdd(long volatile *Addend, long Value);
((defined(__i386__) && \
defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)) || \
defined(__ia64__) || defined(__x86_64__) || \
- (defined(__powerpc__) && !defined(__powerpc64__)) || \
+ defined(__powerpc__) || \
(defined(__arm__) && \
defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)) || \
defined(__aarch64__) || defined(__alpha))))
« no previous file with comments | « nspr/pr/include/md/_linux.cfg ('k') | nspr/pr/include/prbit.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698