[PATCH] tests/nouveau/threaded: adapt ioctl signature

Ross Burton ross.burton at intel.com
Mon Jun 18 15:15:49 UTC 2018


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.
---
 tests/nouveau/threaded.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/nouveau/threaded.c b/tests/nouveau/threaded.c
index 3669bcd3..e1c27c01 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.11.0



More information about the dri-devel mailing list