]> granicus.if.org Git - strace/commitdiff
Include <linux/ioctl.h> for _IOC_* macros
authorFelix Janda <felix.janda@posteo.de>
Sat, 28 Mar 2015 17:40:13 +0000 (18:40 +0100)
committerDmitry V. Levin <ldv@altlinux.org>
Sat, 28 Mar 2015 22:37:30 +0000 (22:37 +0000)
Fix a compilation failure with musl libc.

* evdev.c: Include <linux/ioctl.h>.
* ioctl.c: Include <linux/ioctl.h> instead of <asm/ioctl.h>.
* ioctlsort.c: Likewise.

Reported-by: Dima Krasner <dima@dimakrasner.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
evdev.c
ioctl.c
ioctlsort.c

diff --git a/evdev.c b/evdev.c
index 9a7430db4d86b782066ded982066381ed1909110..e06f9c151e3abb4f0cf79cb10289afe7521e2e8b 100644 (file)
--- a/evdev.c
+++ b/evdev.c
@@ -28,6 +28,8 @@
 
 #include "defs.h"
 
+#include <linux/ioctl.h>
+
 #ifdef HAVE_LINUX_INPUT_H
 #include <linux/input.h>
 #include "xlat/evdev_abs.h"
diff --git a/ioctl.c b/ioctl.c
index 46f833422d1bc376486bd89a3f0f9b026db96bfa..c67d048be760578118e7501e71f660624511e986 100644 (file)
--- a/ioctl.c
+++ b/ioctl.c
@@ -29,7 +29,7 @@
  */
 
 #include "defs.h"
-#include <asm/ioctl.h>
+#include <linux/ioctl.h>
 #include "xlat/ioctl_dirs.h"
 
 #ifdef HAVE_LINUX_INPUT_H
index 333556c8130b7b65a9671a478f5dee6364824efd..9c3169102580abfe3af3c9ff8779cb6f9a9f6af9 100644 (file)
@@ -33,7 +33,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <asm/ioctl.h>
+#include <linux/ioctl.h>
 
 struct ioctlent {
        const char *info;