38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
|
From 6c7b305869b941e52cb846cbed5e4a5c85d035d9 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ross Burton <ross.burton@intel.com>
|
||
|
|
Date: Mon, 18 Jun 2018 15:07:03 +0100
|
||
|
|
Subject: [PATCH] tests/nouveau/threaded: adapt ioctl signature
|
||
|
|
|
||
|
|
POSIX says ioctl() has the signature (int, int, ...) but glibc has decided to
|
||
|
|
use (int, unsigned long int, ...) instead.
|
||
|
|
|
||
|
|
Use a #ifdef to adapt the replacement function as appropriate.
|
||
|
|
|
||
|
|
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||
|
|
|
||
|
|
[Taken from https://raw.githubusercontent.com/openembedded/openembedded-core/master/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch]
|
||
|
|
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||
|
|
---
|
||
|
|
tests/nouveau/threaded.c | 4 ++++
|
||
|
|
1 file changed, 4 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/tests/nouveau/threaded.c b/tests/nouveau/threaded.c
|
||
|
|
index 3669bcd..e1c27c0 100644
|
||
|
|
--- a/tests/nouveau/threaded.c
|
||
|
|
+++ b/tests/nouveau/threaded.c
|
||
|
|
@@ -36,7 +36,11 @@ static int failed;
|
||
|
|
|
||
|
|
static int import_fd;
|
||
|
|
|
||
|
|
+#ifdef __GLIBC__
|
||
|
|
int ioctl(int fd, unsigned long request, ...)
|
||
|
|
+#else
|
||
|
|
+int ioctl(int fd, int request, ...)
|
||
|
|
+#endif
|
||
|
|
{
|
||
|
|
va_list va;
|
||
|
|
int ret;
|
||
|
|
--
|
||
|
|
2.24.0
|
||
|
|
|