From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 15 Mar 2012 05:09:19 +0000 (-0400)
Subject: improve ifdef check with decode_subcall
X-Git-Tag: v4.7~87
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3362e89f66acde52605c654d904b2aebceb92297;p=strace

improve ifdef check with decode_subcall

Use the same ifdef logic around the call sites of decode_subcall()
to protect the definition of the func itself.  This fixes warnings
for targets like hppa which don't use this func.

* syscall.c (decode_subcall): Wrap in SYS_socket_subcall and
SYS_ipc_subcall define checks.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---

diff --git a/syscall.c b/syscall.c
index 546a8c41..657cdbf1 100644
--- a/syscall.c
+++ b/syscall.c
@@ -516,7 +516,7 @@ qualify(const char *s)
 
 enum subcall_style { shift_style, deref_style, mask_style, door_style };
 
-#if !(defined(ALPHA) || defined(MIPS) || defined(__ARM_EABI__))
+#if defined(SYS_socket_subcall) || defined(SYS_ipc_subcall)
 
 static void
 decode_subcall(struct tcb *tcp, int subcall, int nsubcalls, enum subcall_style style)
@@ -580,7 +580,8 @@ decode_subcall(struct tcb *tcp, int subcall, int nsubcalls, enum subcall_style s
 		break;
 	}
 }
-#endif
+
+#endif /* SYS_socket_subcall || SYS_ipc_subcall */
 
 int
 printargs(struct tcb *tcp)