Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-07-18 00:58:31 +00:00
Code Issues Projects Releases Wiki Activity

criu: fix conflicting headers

Browse source 
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>
This commit is contained in:
Radostin Stoyanov 2022-07-31 16:07:30 +00:00 • committed by Andrei Vagin
parent eb4ecb3cfd
commit e8a6765d1e
11 changed files with 64 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

13
scripts/feature-tests.mak
View file

@ -137,19 +137,6 @@ ENTRY(main)
END(main)
endef
define FEATURE_TEST_FSCONFIG
#include <linux/mount.h>
int main(void)
{
if (FSCONFIG_CMD_CREATE > 0)
return 0;
return 0;
}
endef
define FEATURE_TEST_NFTABLES_LIB_API_0
#include <string.h>