Use #if idiom instead of #ifdef for HAVE_ARCH_* macros.

* linux/arch_defs_.h [!HAVE_ARCH_OLD_MMAP] (HAVE_ARCH_OLD_MMAP): New
macro.
[!HAVE_ARCH_OLD_MMAP_PGOFF] (HAVE_ARCH_OLD_MMAP_PGOFF): Likewise.
* defs.h: Use #if instead of #ifdef to check HAVE_ARCH_OLD_MMAP.
* mem.c: Use #if instead of #ifdef to check HAVE_ARCH_OLD_MMAP
and HAVE_ARCH_OLD_MMAP_PGOFF
* pathtrace.c: Likewise.

diff --git a/defs.h b/defs.h
index 20f593e0d3bcb0ec908706c976f43396b72aec75..41c8f60f9d2b0842338cb3112dd712eb9b75f6d0 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -575,7 +575,7 @@ extern void print_numeric_long_umask(unsigned long);
 extern void print_dev_t(unsigned long long dev);
 extern void print_abnormal_hi(kernel_ulong_t);
 
-#ifdef HAVE_ARCH_OLD_MMAP
+#if HAVE_ARCH_OLD_MMAP
 extern kernel_ulong_t *fetch_old_mmap_args(struct tcb *tcp);
 #endif
 

diff --git a/linux/arch_defs_.h b/linux/arch_defs_.h
index 18c9a030df5ececcbe9c55dac35e071d4a63a265..c08694d211765c67d12fe92ddc437551d40a08b5 100644 (file)
--- a/linux/arch_defs_.h
+++ b/linux/arch_defs_.h
@@ -1 +1,9 @@
 /* Fallback file for arch-specific definitions.  */
+
+#ifndef HAVE_ARCH_OLD_MMAP
+# define HAVE_ARCH_OLD_MMAP 0
+#endif
+
+#ifndef HAVE_ARCH_OLD_MMAP_PGOFF
+# define HAVE_ARCH_OLD_MMAP_PGOFF 0
+#endif

diff --git a/mem.c b/mem.c
index 8e87ce4610cb326ed026ca42ab49027942fcc3ff..4310179d641700e46ce60ca34bdb78c5ec509231 100644 (file)
--- a/mem.c
+++ b/mem.c
@@ -107,7 +107,7 @@ print_mmap(struct tcb *tcp, kernel_ulong_t *u_arg, unsigned long long offset)
  * Confused? Me too!
  */
 
-#ifdef HAVE_ARCH_OLD_MMAP
+#if HAVE_ARCH_OLD_MMAP
 /**
  * Fetch old_mmap/old_mmap_pgoff arguments that are provided as a 6-element
  * array.  Return pointer to a static array or NULL in case of fetch failure.
@@ -144,7 +144,7 @@ SYS_FUNC(old_mmap)
        return RVAL_DECODED | RVAL_HEX;
 }
 
-# ifdef HAVE_ARCH_OLD_MMAP_PGOFF
+# if HAVE_ARCH_OLD_MMAP_PGOFF
 /* Params are pointed to by u_arg[0], offset is in pages */
 SYS_FUNC(old_mmap_pgoff)
 {

diff --git a/pathtrace.c b/pathtrace.c
index 99b87111c3ef606ab62057f5dcb222508718e4a1..14cba6f182eb844ebabc430cbe19303446023a0d 100644 (file)
--- a/pathtrace.c
+++ b/pathtrace.c
@@ -214,9 +214,9 @@ pathtrace_match_set(struct tcb *tcp, struct path_set *set)
                        upathmatch(tcp, tcp->u_arg[1], set) ||
                        upathmatch(tcp, tcp->u_arg[3], set);
 
-#ifdef HAVE_ARCH_OLD_MMAP
+#if HAVE_ARCH_OLD_MMAP
        case SEN_old_mmap:
-# ifdef HAVE_ARCH_OLD_MMAP_PGOFF
+# if HAVE_ARCH_OLD_MMAP_PGOFF
        case SEN_old_mmap_pgoff:
 # endif
        {