mirror of
git://slackware.nl/current.git
synced 2025-01-10 05:25:51 +01:00
ca27dc818b
a/kernel-firmware-20220804_e6185d5-noarch-1.txz: Upgraded. a/util-linux-2.38.1-x86_64-1.txz: Upgraded. ap/mpg123-1.30.2-x86_64-1.txz: Upgraded. n/NetworkManager-1.38.2-x86_64-1.txz: Upgraded. xap/libnma-1.8.40-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.28.0-x86_64-1.txz: Upgraded. extra/php81/php81-8.1.9-x86_64-1.txz: Upgraded.
43 lines
1.8 KiB
Diff
43 lines
1.8 KiB
Diff
From 2701442d0cf6292f6624443c15813d6d1a3562fe Mon Sep 17 00:00:00 2001
|
|
From: Martin Liska <mliska@suse.cz>
|
|
Date: Mon, 11 Jul 2022 22:03:14 +0200
|
|
Subject: [PATCH] libsanitizer: cherry-pick 9cf13067cb5088626ba7 from upstream
|
|
|
|
9cf13067cb5088626ba7ee1ec4c42ec59c7995a0 [sanitizer] Remove #include <linux/fs.h> to resolve fsconfig_command/mount_attr conflict with glibc 2.36
|
|
---
|
|
.../sanitizer_platform_limits_posix.cpp | 10 ++++++----
|
|
1 file changed, 6 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
|
|
index 8ed3e92d270..97fd07acf9d 100644
|
|
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
|
|
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
|
|
@@ -73,7 +73,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>
|
|
@@ -869,10 +871,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;
|
|
--
|
|
2.31.1
|
|
|
|
|