X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=urcu%2Farch%2Fppc.h;h=791529ebb1a08ff3db124103474522b77bf0ad15;hb=1a186a881c195c0f240c0baa813056b0cc1eab91;hp=0bef952ccd20095714bcb96839464a7fdf8681ff;hpb=f8c43f458c80566d298d539ec518a8be8c7cc861;p=urcu.git

diff --git a/urcu/arch/ppc.h b/urcu/arch/ppc.h
index 0bef952..791529e 100644
--- a/urcu/arch/ppc.h
+++ b/urcu/arch/ppc.h
@@ -25,10 +25,11 @@
 #include <urcu/compiler.h>
 #include <urcu/config.h>
 #include <urcu/syscall-compat.h>
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
-#endif 
+#endif
 
 /* Include size of POWER5+ L3 cache lines: 256 bytes */
 #define CAA_CACHE_LINE_SIZE	256
@@ -84,15 +85,15 @@ extern "C" {
 
 #define HAS_CAA_GET_CYCLES
 
-typedef unsigned long long cycles_t;
+typedef uint64_t caa_cycles_t;
 
 #ifdef __powerpc64__
-static inline cycles_t caa_get_cycles(void)
+static inline caa_cycles_t caa_get_cycles(void)
 {
-	return (cycles_t) mftb();
+	return (caa_cycles_t) mftb();
 }
 #else
-static inline cycles_t caa_get_cycles(void)
+static inline caa_cycles_t caa_get_cycles(void)
 {
 	unsigned long h, l;
 
@@ -102,20 +103,20 @@ static inline cycles_t caa_get_cycles(void)
 		l = mftbl();
 		cmm_barrier();
 		if (mftbu() == h)
-			return (((cycles_t) h) << 32) + l;
+			return (((caa_cycles_t) h) << 32) + l;
 	}
 }
 #endif
 
 /*
- * Define the membarrier system call number if not yet available in the
- * system headers.
+ * On Linux, define the membarrier system call number if not yet available in
+ * the system headers.
  */
-#ifndef __NR_membarrier
+#if (defined(__linux__) && !defined(__NR_membarrier))
 #define __NR_membarrier		365
 #endif
 
-#ifdef __cplusplus 
+#ifdef __cplusplus
 }
 #endif