]> granicus.if.org Git - strace/commitdiff
Fix compilation on 2.4.20 kernel based system
authorDenys Vlasenko <dvlasenk@redhat.com>
Mon, 15 Aug 2011 09:36:09 +0000 (11:36 +0200)
committerDenys Vlasenko <dvlasenk@redhat.com>
Mon, 15 Aug 2011 09:36:09 +0000 (11:36 +0200)
* block.c (block_ioctl): add ifdef/endif around BLKGETSIZE64 usage
* strace.c (trace): add ifdef/endif around WIFCONTINUED usage

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
block.c
strace.c

diff --git a/block.c b/block.c
index e00c75b806093f88856df4d8c094b4db8177d5ab..4a3b42890ffe8b78f607b9eb1c842f4afcf51514 100644 (file)
--- a/block.c
+++ b/block.c
@@ -194,6 +194,7 @@ block_ioctl(struct tcb *tcp, long code, long arg)
                        }
                break;
 
+#ifdef BLKGETSIZE64
        /* return an uint64_t */
        case BLKGETSIZE64:
                if (exiting(tcp)) {
@@ -204,6 +205,7 @@ block_ioctl(struct tcb *tcp, long code, long arg)
                                tprintf(", %" PRIu64, val);
                }
                break;
+#endif
 
        /* More complex types */
        case BLKDISCARD:
index 7314d4ade4932702d4c6d214c17c07ec99ddafac..df10a723e31229468f33b049a705bdabf5a32a45 100644 (file)
--- a/strace.c
+++ b/strace.c
@@ -2450,8 +2450,10 @@ trace()
                                sprintf(buf, "WIFEXITED,exitcode=%u", WEXITSTATUS(status));
                        if (WIFSTOPPED(status))
                                sprintf(buf, "WIFSTOPPED,sig=%s", signame(WSTOPSIG(status)));
+#ifdef WIFCONTINUED
                        if (WIFCONTINUED(status))
                                strcpy(buf, "WIFCONTINUED");
+#endif
                        fprintf(stderr, " [wait(0x%04x) = %u] %s\n", status, pid, buf);
                }