Cleanup: remove leftover manual pthread detection

[urcu.git] / urcu / arch / ppc.h

diff --git a/urcu/arch/ppc.h b/urcu/arch/ppc.h
index dbdfec8a58dd3f29414fbc99aa48e83fa701cff3..791529ebb1a08ff3db124103474522b77bf0ad15 100644 (file)
--- a/urcu/arch/ppc.h
+++ b/urcu/arch/ppc.h
@@ -25,6 +25,7 @@
 #include <urcu/compiler.h>
 #include <urcu/config.h>
 #include <urcu/syscall-compat.h>
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -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,16 +103,16 @@ 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