| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 1 | Upstream-Status: Submitted |
| 2 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 3 | |
| 4 | From 46c0fd6c827a8cb4d04e067bf04fab579ac4712e Mon Sep 17 00:00:00 2001 |
| 5 | From: Ross Burton <ross.burton@intel.com> |
| 6 | Date: Mon, 18 Jun 2018 15:07:03 +0100 |
| 7 | Subject: [PATCH] tests/nouveau/threaded: adapt ioctl signature |
| 8 | |
| 9 | POSIX says ioctl() has the signature (int, int, ...) but glibc has decided to |
| 10 | use (int, unsigned long int, ...) instead. |
| 11 | |
| 12 | Use a #ifdef to adapt the replacement function as appropriate. |
| 13 | --- |
| 14 | tests/nouveau/threaded.c | 4 ++++ |
| 15 | 1 file changed, 4 insertions(+) |
| 16 | |
| 17 | diff --git a/tests/nouveau/threaded.c b/tests/nouveau/threaded.c |
| 18 | index 3669bcd3..e1c27c01 100644 |
| 19 | --- a/tests/nouveau/threaded.c |
| 20 | +++ b/tests/nouveau/threaded.c |
| 21 | @@ -36,7 +36,11 @@ static int failed; |
| 22 | |
| 23 | static int import_fd; |
| 24 | |
| 25 | +#ifdef __GLIBC__ |
| 26 | int ioctl(int fd, unsigned long request, ...) |
| 27 | +#else |
| 28 | +int ioctl(int fd, int request, ...) |
| 29 | +#endif |
| 30 | { |
| 31 | va_list va; |
| 32 | int ret; |
| 33 | -- |
| 34 | 2.11.0 |
| 35 | |