[UNIKRAFT/MUSL PATCH 3/7] patches: Update ioctl prototype definition

[gaulthier.gain@xxxxxxxxx]

From: Gaulthier Gain <gaulthier.gain@xxxxxxxxx>

This patch updates the `ioctl` prototype with a more precise definition
which is also compliant with vfscore.

Signed-off-by: Alexander Jung <alexander.jung@xxxxxxxxx>
Signed-off-by: Gaulthier Gain <gaulthier.gain@xxxxxxxxx>
---
 patches/0008-Fix-sys_ioctl_h-conflicts.patch  | 27 -----------------
 .../0008-Use-compatible-ioctl-prototype.patch | 30 +++++++++++++++++++
 2 files changed, 30 insertions(+), 27 deletions(-)
 delete mode 100644 patches/0008-Fix-sys_ioctl_h-conflicts.patch
 create mode 100644 patches/0008-Use-compatible-ioctl-prototype.patch

diff --git a/patches/0008-Fix-sys_ioctl_h-conflicts.patch 
b/patches/0008-Fix-sys_ioctl_h-conflicts.patch
deleted file mode 100644
index 953b8ad..0000000
--- a/patches/0008-Fix-sys_ioctl_h-conflicts.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 2aa8ddeb0deb165b28f9e70b14da69b7bf9b938d Mon Sep 17 00:00:00 2001
-From: gaulthier gain <gaulthier.gain@xxxxxxxxx>
-Date: Mon, 24 Feb 2020 21:01:40 +0000
-Subject: [PATCH] Remove <sys/ioctl> from musl internal
-
-Signed-off-by: Gaulthier Gain <gaulthier.gain@xxxxxxxxx>
----
- include/sys/mount.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/include/sys/mount.h b/include/sys/mount.h
-index 57a89c0..6516a51 100644
---- a/include/sys/mount.h
-+++ b/include/sys/mount.h
-@@ -5,7 +5,9 @@
- extern "C" {
- #endif
-
-+#ifndef _VFSCORE_SYS_MOUNT_H_
- #include <sys/ioctl.h>
-+#endif
-
- #define BLKROSET   _IO(0x12, 93)
- #define BLKROGET   _IO(0x12, 94)
---
-2.17.1
-
diff --git a/patches/0008-Use-compatible-ioctl-prototype.patch 
b/patches/0008-Use-compatible-ioctl-prototype.patch
new file mode 100644
index 0000000..85cd3b0
--- /dev/null
+++ b/patches/0008-Use-compatible-ioctl-prototype.patch
@@ -0,0 +1,30 @@
+From 150959f0fd0b04919fb1384abb8998fd8e2c1ca4 Mon Sep 17 00:00:00 2001
+From: Alexander Jung <alexander.jung@xxxxxxxxx>
+Date: Tue, 30 Jun 2020 19:45:36 +0200
+Subject: [PATCH] Use compatible ioctl prototype
+
+This patch updates the `ioctl` prototype with a more precise definition
+which is also compliant with vfscore.
+
+Signed-off-by: Alexander Jung <alexander.jung@xxxxxxxxx>
+---
+ include/sys/ioctl.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/include/sys/ioctl.h b/include/sys/ioctl.h
+index d0415b3..9929002 100644
+--- a/include/sys/ioctl.h
++++ b/include/sys/ioctl.h
+@@ -6,7 +6,8 @@ extern "C" {
+ 
+ #include <bits/ioctl.h>
+ 
+-int ioctl (int, int, ...);
++// int ioctl (int, int, ...);
++int ioctl(int fd, unsigned long int request, ...);
+ 
+ #ifdef __cplusplus
+ }
+-- 
+2.20.1
+
-- 
2.17.1