From bdceda8665f35d4a9020ea127a15c69c0ae0d551 Mon Sep 17 00:00:00 2001 From: auronandace Date: Thu, 26 Mar 2026 11:09:52 +0000 Subject: [PATCH] move sys ioctl bits to cbindgen --- include/bits/sys/ioctl.h | 11 ----------- src/header/sys_ioctl/cbindgen.toml | 14 +++++++++++++- 2 files changed, 13 insertions(+), 12 deletions(-) delete mode 100644 include/bits/sys/ioctl.h diff --git a/include/bits/sys/ioctl.h b/include/bits/sys/ioctl.h deleted file mode 100644 index 2a2aab608a..0000000000 --- a/include/bits/sys/ioctl.h +++ /dev/null @@ -1,11 +0,0 @@ -// Shamelessly copy-pasted from musl - -#define _IOC(a,b,c,d) ( ((a)<<30) | ((b)<<8) | (c) | ((d)<<16) ) -#define _IOC_NONE 0U -#define _IOC_WRITE 1U -#define _IOC_READ 2U - -#define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0) -#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c)) -#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c)) -#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c)) diff --git a/src/header/sys_ioctl/cbindgen.toml b/src/header/sys_ioctl/cbindgen.toml index 9262d57af0..64117641a7 100644 --- a/src/header/sys_ioctl/cbindgen.toml +++ b/src/header/sys_ioctl/cbindgen.toml @@ -1,7 +1,19 @@ include_guard = "_SYS_IOCTL_H" language = "C" style = "Tag" -trailer = "#include " +trailer = """ +// Shamelessly copy-pasted from musl + +#define _IOC(a,b,c,d) ( ((a)<<30) | ((b)<<8) | (c) | ((d)<<16) ) +#define _IOC_NONE 0U +#define _IOC_WRITE 1U +#define _IOC_READ 2U + +#define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0) +#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c)) +#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c)) +#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c)) +""" no_includes = true cpp_compat = true