summaryrefslogtreecommitdiff
path: root/src/cairo-atomic-private.h
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@behdad.org>2008-09-04 16:00:40 -0400
committerBehdad Esfahbod <behdad@behdad.org>2008-09-04 16:08:41 -0400
commit44155f7e5941351b224b60644632b55448369e49 (patch)
tree7dea20d5392a867767faf67802d93ad2753036d3 /src/cairo-atomic-private.h
parent0e01534bf0bd64af840ccfa8aeaa1ac1a7cb31b7 (diff)
downloadcairo-44155f7e5941351b224b60644632b55448369e49.tar.gz
Cleanup configure.in macros
Diffstat (limited to 'src/cairo-atomic-private.h')
-rw-r--r--src/cairo-atomic-private.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/cairo-atomic-private.h b/src/cairo-atomic-private.h
index 85fe95626..56ae7d2a2 100644
--- a/src/cairo-atomic-private.h
+++ b/src/cairo-atomic-private.h
@@ -41,11 +41,13 @@
#include "config.h"
#endif
+# include "cairo-compiler-private.h"
+
CAIRO_BEGIN_DECLS
-#define CAIRO_HAS_ATOMIC_OPS 1
+#if HAVE_INTEL_ATOMIC_PRIMITIVES
-#if CAIRO_HAS_INTEL_ATOMIC_PRIMITIVES
+#define CAIRO_HAS_ATOMIC_OPS 1
typedef int cairo_atomic_int_t;
@@ -53,11 +55,10 @@ typedef int cairo_atomic_int_t;
# define _cairo_atomic_int_dec_and_test(x) (__sync_fetch_and_add(x, -1) == 1)
# define _cairo_atomic_int_cmpxchg(x, oldv, newv) __sync_val_compare_and_swap (x, oldv, newv)
-#else
+#endif
-# include "cairo-compiler-private.h"
-# undef CAIRO_HAS_ATOMIC_OPS
+#ifndef CAIRO_HAS_ATOMIC_OPS
typedef int cairo_atomic_int_t;
@@ -73,7 +74,7 @@ _cairo_atomic_int_cmpxchg (int *x, int oldv, int newv);
#endif
-#ifdef CAIRO_ATOMIC_OP_NEEDS_MEMORY_BARRIER
+#ifdef ATOMIC_OP_NEEDS_MEMORY_BARRIER
# include "cairo-compiler-private.h"