Andrew Geissler | 475cb72 | 2020-07-10 16:00:51 -0500 | [diff] [blame] | 1 | From 55e11765af2bdc8adfac87dab1fb2682f7e6c236 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Tue, 9 Jun 2020 22:10:28 -0700 |
| 4 | Subject: [PATCH] Define daddr_t if __DADDR_T_TYPE is not defined |
Andrew Geissler | 5a43b43 | 2020-06-13 10:46:56 -0500 | [diff] [blame] | 5 | |
| 6 | glibc defined daddr_t but musl does not, ideally it should not be used |
| 7 | and simple int type is enough. However, its better to leave glibc behavior |
| 8 | as it is and only define it to int if daddr_t is not provided by libc |
| 9 | |
| 10 | Upstream-Status: Pending |
| 11 | |
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
Andrew Geissler | 475cb72 | 2020-07-10 16:00:51 -0500 | [diff] [blame] | 13 | |
| 14 | --- |
| 15 | stress-ng.h | 4 ++++ |
| 16 | 1 file changed, 4 insertions(+) |
| 17 | |
| 18 | diff --git a/stress-ng.h b/stress-ng.h |
| 19 | index 1a66293..802dc25 100644 |
Andrew Geissler | 5a43b43 | 2020-06-13 10:46:56 -0500 | [diff] [blame] | 20 | --- a/stress-ng.h |
| 21 | +++ b/stress-ng.h |
Andrew Geissler | 475cb72 | 2020-07-10 16:00:51 -0500 | [diff] [blame] | 22 | @@ -3763,6 +3763,10 @@ struct shim_statx { |
Andrew Geissler | 5a43b43 | 2020-06-13 10:46:56 -0500 | [diff] [blame] | 23 | uint64_t __spare2[14]; |
| 24 | }; |
| 25 | |
| 26 | +#ifndef __DADDR_T_TYPE |
| 27 | +typedef int daddr_t; |
| 28 | +#endif |
| 29 | + |
| 30 | /* old ustat struct */ |
| 31 | struct shim_ustat { |
Andrew Geissler | 475cb72 | 2020-07-10 16:00:51 -0500 | [diff] [blame] | 32 | #if defined(HAVE_DADDR_T) |