X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Farch_generic.h;h=100d3c6c12948a2f88bc769f0dc26325a1036027;hp=25a9f7ac581b971a1b5d62a8b6363e2bad499075;hb=06f22bdbb0c4c4d5db42a2e2dc35818aa61415be;hpb=5481ddb381061bda64aebc039900d21cac6a6caf

diff --git a/urcu/arch_generic.h b/urcu/arch_generic.h
index 25a9f7a..100d3c6 100644
--- a/urcu/arch_generic.h
+++ b/urcu/arch_generic.h
@@ -28,8 +28,8 @@
 extern "C" {
 #endif
 
-#ifndef CACHE_LINE_SIZE
-#define CACHE_LINE_SIZE	64
+#ifndef CAA_CACHE_LINE_SIZE
+#define CAA_CACHE_LINE_SIZE	64
 #endif
 
 #if !defined(cmm_mc) && !defined(cmm_rmc) && !defined(cmm_wmc)
@@ -117,8 +117,8 @@ extern "C" {
 #define cmm_smp_read_barrier_depends()
 #endif
 
-#ifndef cpu_relax
-#define cpu_relax()		cmm_barrier()
+#ifndef caa_cpu_relax
+#define caa_cpu_relax()		cmm_barrier()
 #endif
 
 #ifdef __cplusplus