[CRIU] [PATCH] criu: arm -- Guard __ARM_NR_ definitions

[Cyrill Gorcunov]

Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 criu/arch/arm/include/asm/syscall-aux.h | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/criu/arch/arm/include/asm/syscall-aux.h b/criu/arch/arm/include/asm/syscall-aux.h
index b3bb2247a68c..0b029301f279 100644
--- a/criu/arch/arm/include/asm/syscall-aux.h
+++ b/criu/arch/arm/include/asm/syscall-aux.h
@@ -2,9 +2,26 @@
 # define __NR_mmap2 192
 #endif
 
-#define __ARM_NR_BASE                   0x0f0000
-#define __ARM_NR_breakpoint             (__ARM_NR_BASE+1)
-#define __ARM_NR_cacheflush             (__ARM_NR_BASE+2)
-#define __ARM_NR_usr26                  (__ARM_NR_BASE+3)
-#define __ARM_NR_usr32                  (__ARM_NR_BASE+4)
-#define __ARM_NR_set_tls                (__ARM_NR_BASE+5)
+#ifndef __ARM_NR_BASE
+# define __ARM_NR_BASE                   0x0f0000
+#endif
+
+#ifndef __ARM_NR_breakpoint
+# define __ARM_NR_breakpoint             (__ARM_NR_BASE+1)
+#endif
+
+#ifndef __ARM_NR_cacheflush
+# define __ARM_NR_cacheflush             (__ARM_NR_BASE+2)
+#endif
+
+#ifndef __ARM_NR_usr26
+# define __ARM_NR_usr26                  (__ARM_NR_BASE+3)
+#endif
+
+#ifndef __ARM_NR_usr32
+# define __ARM_NR_usr32                  (__ARM_NR_BASE+4)
+#endif
+
+#ifndef __ARM_NR_set_tls
+# define __ARM_NR_set_tls                (__ARM_NR_BASE+5)
+#endif
-- 
2.5.0