| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | From c882bcd18820b44a685f0d5edd7aaff77a88c912 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Thu, 7 Jan 2016 20:17:55 +0000 |
| 4 | Subject: [PATCH 17/32] replace sigval_t with union sigval |
| 5 | |
| 6 | This makes it compatible across musl and glibc |
| 7 | |
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 9 | --- |
| 10 | testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c | 2 +- |
| 11 | testcases/kernel/syscalls/timer_gettime/timer_gettime01.c | 2 +- |
| 12 | testcases/kernel/timers/timer_create/timer_create02.c | 4 ++-- |
| 13 | testcases/kernel/timers/timer_create/timer_create03.c | 4 ++-- |
| 14 | 4 files changed, 6 insertions(+), 6 deletions(-) |
| 15 | |
| 16 | diff --git a/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c b/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c |
| 17 | index d186c1f..bc03544 100644 |
| 18 | --- a/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c |
| 19 | +++ b/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c |
| 20 | @@ -54,7 +54,7 @@ int main(int ac, char **av) |
| 21 | |
| 22 | setup(); |
| 23 | |
| 24 | - ev.sigev_value = (sigval_t) 0; |
| 25 | + ev.sigev_value = (union sigval) 0; |
| 26 | ev.sigev_signo = SIGALRM; |
| 27 | ev.sigev_notify = SIGEV_SIGNAL; |
| 28 | TEST(ltp_syscall(__NR_timer_create, CLOCK_REALTIME, &ev, &timer)); |
| 29 | diff --git a/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c b/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c |
| 30 | index b583aee..9371a6a 100644 |
| 31 | --- a/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c |
| 32 | +++ b/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c |
| 33 | @@ -55,7 +55,7 @@ int main(int ac, char **av) |
| 34 | |
| 35 | setup(); |
| 36 | |
| 37 | - ev.sigev_value = (sigval_t) 0; |
| 38 | + ev.sigev_value = (union sigval) 0; |
| 39 | ev.sigev_signo = SIGALRM; |
| 40 | ev.sigev_notify = SIGEV_SIGNAL; |
| 41 | TEST(ltp_syscall(__NR_timer_create, CLOCK_REALTIME, &ev, &timer)); |
| 42 | diff --git a/testcases/kernel/timers/timer_create/timer_create02.c b/testcases/kernel/timers/timer_create/timer_create02.c |
| 43 | index 7f528ed..1127400 100644 |
| 44 | --- a/testcases/kernel/timers/timer_create/timer_create02.c |
| 45 | +++ b/testcases/kernel/timers/timer_create/timer_create02.c |
| 46 | @@ -142,7 +142,7 @@ void setup_test(int option) |
| 47 | { |
| 48 | switch (option) { |
| 49 | case 0: |
| 50 | - evp.sigev_value = (sigval_t) 0; |
| 51 | + evp.sigev_value = (union sigval) 0; |
| 52 | evp.sigev_signo = SIGALRM; |
| 53 | evp.sigev_notify = SIGEV_SIGNAL; |
| 54 | evp_ptr = &evp; |
| 55 | @@ -151,7 +151,7 @@ void setup_test(int option) |
| 56 | evp_ptr = NULL; |
| 57 | break; |
| 58 | case 2: |
| 59 | - evp.sigev_value = (sigval_t) 0; |
| 60 | + evp.sigev_value = (union sigval) 0; |
| 61 | evp.sigev_signo = SIGALRM; /* any will do */ |
| 62 | evp.sigev_notify = SIGEV_NONE; |
| 63 | evp_ptr = &evp; |
| 64 | diff --git a/testcases/kernel/timers/timer_create/timer_create03.c b/testcases/kernel/timers/timer_create/timer_create03.c |
| 65 | index 291fcfa..8b01bf7 100644 |
| 66 | --- a/testcases/kernel/timers/timer_create/timer_create03.c |
| 67 | +++ b/testcases/kernel/timers/timer_create/timer_create03.c |
| 68 | @@ -129,7 +129,7 @@ void setup_test(int option) |
| 69 | { |
| 70 | switch (option) { |
| 71 | case 0: |
| 72 | - evp.sigev_value = (sigval_t) 0; |
| 73 | + evp.sigev_value = (union sigval) 0; |
| 74 | evp.sigev_signo = SIGALRM; |
| 75 | evp.sigev_notify = SIGEV_SIGNAL; |
| 76 | evp_ptr = &evp; |
| 77 | @@ -138,7 +138,7 @@ void setup_test(int option) |
| 78 | evp_ptr = NULL; |
| 79 | break; |
| 80 | case 2: |
| 81 | - evp.sigev_value = (sigval_t) 0; |
| 82 | + evp.sigev_value = (union sigval) 0; |
| 83 | evp.sigev_signo = SIGALRM; /* any will do */ |
| 84 | evp.sigev_notify = SIGEV_NONE; |
| 85 | evp_ptr = &evp; |
| 86 | -- |
| 87 | 2.7.0 |
| 88 | |