| From bf5dd2932200e0199a38f3028d3bef2253f32e38 Mon Sep 17 00:00:00 2001 |
| From: Dengke Du <dengke.du@windriver.com> |
| Date: Thu, 9 Feb 2017 17:17:37 +0800 |
| Subject: [PATCH] fix redefinition of 'struct msgbuf' error building with musl |
| |
| When building with musl the file "sys/msg.h" already contain 'struct msgbuf' |
| |
| Upstream-Status: Submitted [https://github.com/linux-test-project/ltp/pull/177] |
| |
| Signed-off-by: Dengke Du <dengke.du@windriver.com> |
| --- |
| testcases/kernel/syscalls/ipc/msgrcv/msgrcv08.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv08.c b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv08.c |
| index a757c0d18..e023114d2 100644 |
| --- a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv08.c |
| +++ b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv08.c |
| @@ -47,11 +47,13 @@ const char *TCID = "msgrcv08"; |
| const int TST_TOTAL = 1; |
| |
| #if __WORDSIZE == 32 |
| - |
| +#ifdef __GLIBC__ |
| struct msgbuf { |
| long mtype; /* message type, must be > 0 */ |
| char mtext[16]; /* message data */ |
| }; |
| +#else |
| +#endif |
| |
| static void msr(int msqid) |
| { |
| -- |
| 2.11.0 |
| |