diff options
| author | Radostin Stoyanov <rstoyanov@fedoraproject.org> | 2022-07-31 19:07:30 +0300 |
|---|---|---|
| committer | Radostin Stoyanov <rstoyanov@fedoraproject.org> | 2022-08-05 17:21:47 +0300 |
| commit | 4c86d6a7d54abb64fc5a15131f3351224e8c071b (patch) | |
| tree | a0d628746368256255b0895d619e1a25266f012b /Makefile.config | |
| parent | f32e626e42c5f53014e5db04ff0bb0516066707e (diff) | |
criu: fix conflicting headers
There are several changes in glibc 2.36 that make sys/mount.h header
incompatible with kernel headers:
https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
This patch removes conflicting includes for `<linux/mount.h>` and
updates the content of `criu/include/linux/mount.h` to match
`/usr/include/sys/mount.h`. In addition, inline definitions sys_*()
functions have been moved from "linux/mount.h" to "syscall.h" to
avoid conflicts with `uapi/compel/plugins/std/syscall.h` and
`<unistd.h>`. The include for `<linux/aio_abi.h>` has been replaced
with local include to avoid conflicts with `<sys/mount.h>`.
Fixes: #1949
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Diffstat (limited to 'Makefile.config')
| -rw-r--r-- | Makefile.config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.config b/Makefile.config index d113e2246..270ec61c0 100644 --- a/Makefile.config +++ b/Makefile.config @@ -78,7 +78,7 @@ export DEFINES += $(FEATURE_DEFINES) export CFLAGS += $(FEATURE_DEFINES) FEATURES_LIST := TCP_REPAIR STRLCPY STRLCAT PTRACE_PEEKSIGINFO \ - SETPROCTITLE_INIT MEMFD TCP_REPAIR_WINDOW FSCONFIG MEMFD_CREATE \ + SETPROCTITLE_INIT MEMFD TCP_REPAIR_WINDOW MEMFD_CREATE \ OPENAT2 NO_LIBC_RSEQ_DEFS # $1 - config name |