Commit afea47ea authored by Nikolay Borisov's avatar Nikolay Borisov Committed by Pavel Emelyanov

Move headers around to fix issues on custom-built glibc

restorer.h eventually includes fcntl-linux.h system file, which
indiscriminately defines F_SETPIPE_SZ/F_GETPIPE_SZ. But those
are also defined by CRIU's own headers in config-base.h. The latter
contains ifdef guards, however in arch/x86/crtools.c it's included
after restorer.h which causes gcc warnings for macro redefinition.

Fix this by reordering the 2 headers, ensuring the ifdef guards in
config-base.h actually work.
Signed-off-by: 's avatarNikolay Borisov <kernel@kyup.com>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
parent 42212bf8
......@@ -11,9 +11,9 @@
#include "cr_options.h"
#include "compiler.h"
#include "restorer.h"
#include "ptrace.h"
#include "parasite-syscall.h"
#include "restorer.h"
#include "log.h"
#include "util.h"
#include "cpu.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment