diff options
| author | Karel Zak <kzak@redhat.com> | 2024-04-29 10:27:17 +0200 |
|---|---|---|
| committer | Karel Zak <kzak@redhat.com> | 2024-04-29 10:27:17 +0200 |
| commit | 7aa04e5052e36d4ed7b689270cd9515e3365219d (patch) | |
| tree | 7c14123d7926aba5f7b6dbdc1a7398e4bc2e2968 | |
| parent | 2f4a8fa5c43f83418ca923b702a589779cf49819 (diff) | |
| parent | b6e6fb4a3e8a2025d67eb4ea4c82711a530184f8 (diff) | |
| download | util-linux-7aa04e5052e36d4ed7b689270cd9515e3365219d.tar.gz | |
Merge branch 'lsfd/fcntl.h' of https://github.com/t-8ch/util-linux
* 'lsfd/fcntl.h' of https://github.com/t-8ch/util-linux:
lsfd: include linux/fcntl.h
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | lsfd-cmd/decode-file-flags.c | 16 | ||||
| -rw-r--r-- | meson.build | 2 |
3 files changed, 5 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index 70a60cf5d1..b360e448ea 100644 --- a/configure.ac +++ b/configure.ac @@ -317,8 +317,6 @@ AC_CHECK_HEADERS([linux/compiler.h linux/blkpg.h linux/major.h], [], [], [ #endif ]) AC_CHECK_HEADERS([ \ - asm-generic/fcntl.h \ - asm/fcntl.h \ asm/io.h \ byteswap.h \ endian.h \ diff --git a/lsfd-cmd/decode-file-flags.c b/lsfd-cmd/decode-file-flags.c index bd87c7d794..29c8999cd3 100644 --- a/lsfd-cmd/decode-file-flags.c +++ b/lsfd-cmd/decode-file-flags.c @@ -24,30 +24,24 @@ /* lsfd_decode_file_flags() is for decoding `flags' field of * /proc/$pid/fdinfo/$fd. Bits of the field have name defined - * in fctl.h. + * in fcntl.h. * A system on which lsfd is built may have multiple - * fctl.h files: + * fcntl.h files: * + * - /usr/include/linux/fcntl.h (a part of Linux kernel) * - /usr/include/asm/fcntl.h (a part of Linux kernel) * - /usr/include/asm-generic/fcntl.h (a part of Linux kernel) * - /usr/include/fcntl.h (a part of glibc) * - /usr/include/bits/fcntl.h (a part of glibc) * - * For decoding purpose, /usr/include/asm/fcntl.h or - * /usr/include/asm-generic/fcntl.h is needed. + * For decoding purpose, /usr/include/linuc/fcntl.h is needed. * * /usr/include/bits/fcntl.h and /usr/include/fcntl.h are * not suitable for decoding. They should not be included. * /usr/include/fcntl.h includes /usr/include/bits/fcntl.h. */ -#if defined HAVE_ASM_FCNTL_H -#include <asm/fcntl.h> -#elif defined HAVE_ASM_GENERIC_FCNTL_H -#include <asm-generic/fcntl.h> -#else -#error "kernel's fcntl.h is not available" -#endif +#include <linux/fcntl.h> #include <stddef.h> /* for size_t */ struct ul_buffer; diff --git a/meson.build b/meson.build index 23fed16edd..a78ebd6b89 100644 --- a/meson.build +++ b/meson.build @@ -189,8 +189,6 @@ headers = ''' unistd.h utmp.h utmpx.h - asm-generic/fcntl.h - asm/fcntl.h asm/io.h linux/blkzoned.h linux/capability.h |