Skip to content

Commit d771a20

Browse files
committed
Workaround for glibc 2.36 sys/mount.h
Avoid including sys/mount.h which isn't compatible with linux headers. Signed-off-by: Konstantin Khlebnikov <koct9i@gmail.com> Link: https://sourceware.org/git/?p=glibc.git;a=commit;h=774058d72942249f71d74e7f2b639f77184160a6 Closes: #50
1 parent eb7f417 commit d771a20

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

ioping.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555

5656
#ifdef __linux__
5757
# include <sys/ioctl.h>
58-
# include <sys/mount.h>
5958
# include <sys/sysmacros.h>
6059
# include <sys/syscall.h>
6160
# define HAVE_CLOCK_GETTIME
@@ -68,13 +67,14 @@
6867
# define HAVE_STATVFS
6968
# define MAX_RW_COUNT 0x7ffff000 /* 2G - 4K */
7069

71-
#undef RWF_NOWAIT
70+
# undef RWF_NOWAIT
71+
# include <linux/fs.h>
7272
# include <linux/aio_abi.h>
7373
# ifndef RWF_NOWAIT
7474
# define aio_rw_flags aio_reserved1
7575
# endif
76-
#undef RWF_NOWAIT
7776

77+
# undef RWF_NOWAIT
7878
# include <sys/uio.h>
7979
# ifdef RWF_NOWAIT
8080
# define HAVE_LINUX_PREADV2

0 commit comments

Comments
 (0)