mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-04 04:46:43 +00:00
32 lines
1.4 KiB
Diff
32 lines
1.4 KiB
Diff
Derived from ../11/fix-struct-redefinition-on-glibc-2.36.patch (upstream commit d2356ebb0084a0d80dbfe33040c9afe938c15d19)
|
|
|
|
diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
|
|
index e8fce8a02..cb1ac806e 100644
|
|
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
|
|
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
|
|
@@ -65,7 +65,9 @@
|
|
#include <sys/vt.h>
|
|
#include <linux/cdrom.h>
|
|
#include <linux/fd.h>
|
|
+#if SANITIZER_ANDROID
|
|
#include <linux/fs.h>
|
|
+#endif
|
|
#include <linux/hdreg.h>
|
|
#include <linux/input.h>
|
|
#include <linux/ioctl.h>
|
|
@@ -846,10 +848,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
|
|
unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT;
|
|
unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT;
|
|
#endif
|
|
- unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS;
|
|
- unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION;
|
|
- unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS;
|
|
- unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION;
|
|
+ unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long);
|
|
+ unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long);
|
|
+ unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long);
|
|
+ unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long);
|
|
unsigned IOCTL_GIO_CMAP = GIO_CMAP;
|
|
unsigned IOCTL_GIO_FONT = GIO_FONT;
|
|
unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP;
|