Commit 7a6f51de6d4f5543634889e58c30a0a6ceb75a09
2012-01-26T18:03:14
win32: Use the Windows Atomic API on MinGW too
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41
diff --git a/src/thread-utils.h b/src/thread-utils.h
index c555479..9139419 100644
--- a/src/thread-utils.h
+++ b/src/thread-utils.h
@@ -11,7 +11,7 @@
/* Common operations even if threading has been disabled */
typedef struct {
-#if defined(_MSC_VER)
+#if defined(GIT_WIN32)
volatile long val;
#else
volatile int val;
@@ -48,10 +48,10 @@ GIT_INLINE(void) git_atomic_set(git_atomic *a, int val)
GIT_INLINE(int) git_atomic_inc(git_atomic *a)
{
-#ifdef __GNUC__
- return __sync_add_and_fetch(&a->val, 1);
-#elif defined(_MSC_VER)
+#if defined(GIT_WIN32)
return InterlockedIncrement(&a->val);
+#elif defined(__GNUC__)
+ return __sync_add_and_fetch(&a->val, 1);
#else
# error "Unsupported architecture for atomic operations"
#endif
@@ -59,10 +59,10 @@ GIT_INLINE(int) git_atomic_inc(git_atomic *a)
GIT_INLINE(int) git_atomic_dec(git_atomic *a)
{
-#ifdef __GNUC__
- return __sync_sub_and_fetch(&a->val, 1);
-#elif defined(_MSC_VER)
+#if defined(GIT_WIN32)
return InterlockedDecrement(&a->val);
+#elif defined(__GNUC__)
+ return __sync_sub_and_fetch(&a->val, 1);
#else
# error "Unsupported architecture for atomic operations"
#endif