[CRIU] [PATCH 2/4] common: Move compiler.h into
Cyrill Gorcunov
gorcunov at openvz.org
Fri Oct 21 04:51:23 PDT 2016
Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
# Conflicts:
# criu/cgroup-props.c
# criu/cr-restore.c
# criu/crtools.c
# criu/eventfd.c
# criu/eventpoll.c
# criu/filesystems.c
# criu/fsnotify.c
# criu/include/file-ids.h
# criu/include/files.h
# criu/include/protobuf.h
# criu/include/rbtree.h
# criu/include/restorer.h
# criu/include/util.h
# criu/log.c
# criu/pie/restorer.c
# criu/pie/util-fd.c
# criu/pie/util.c
# criu/protobuf-desc.c
# criu/protobuf.c
# criu/ptrace.c
# criu/seize.c
# criu/signalfd.c
# criu/tty.c
# criu/util.c
---
compel/include/compiler.h | 2 +-
criu/arch/aarch64/crtools.c | 2 +-
criu/arch/aarch64/include/asm/bitops.h | 2 +-
criu/arch/aarch64/include/asm/string.h | 2 +-
criu/arch/arm/crtools.c | 2 +-
criu/arch/arm/include/asm/bitops.h | 2 +-
criu/arch/arm/include/asm/string.h | 2 +-
criu/arch/ppc64/crtools.c | 2 +-
criu/arch/ppc64/include/asm/bitops.h | 2 +-
criu/arch/ppc64/include/asm/string.h | 2 +-
criu/arch/x86/cpu.c | 2 +-
criu/arch/x86/crtools.c | 2 +-
criu/arch/x86/include/asm/fpu.h | 2 +-
criu/arch/x86/include/asm/string.h | 2 +-
criu/cgroup-props.c | 2 +-
criu/cr-dump.c | 2 +-
criu/cr-restore.c | 2 +-
criu/crtools.c | 2 +-
criu/eventfd.c | 2 +-
criu/eventpoll.c | 2 +-
criu/file-ids.c | 2 +-
criu/filesystems.c | 2 +-
criu/fsnotify.c | 2 +-
criu/include/asm-generic/string.h | 2 +-
criu/include/bug.h | 2 +-
criu/include/err.h | 2 +-
criu/include/file-ids.h | 2 +-
criu/include/files.h | 2 +-
criu/include/image.h | 2 +-
criu/include/namespaces.h | 2 +-
criu/include/plugin.h | 2 +-
criu/include/protobuf.h | 2 +-
criu/include/rbtree.h | 2 +-
criu/include/restorer.h | 2 +-
criu/include/util.h | 2 +-
criu/kerndat.c | 2 +-
criu/log.c | 2 +-
criu/pagemap-cache.c | 2 +-
criu/pie/pie-relocs.c | 2 +-
criu/pie/pie-relocs.h | 2 +-
criu/pie/restorer.c | 2 +-
criu/pie/util-fd.c | 2 +-
criu/pie/util.c | 2 +-
criu/plugin.c | 2 +-
criu/protobuf-desc.c | 2 +-
criu/protobuf.c | 2 +-
criu/ptrace.c | 2 +-
criu/seize.c | 2 +-
criu/signalfd.c | 2 +-
criu/tty.c | 2 +-
criu/util.c | 2 +-
criu/vdso.c | 2 +-
{criu/include => include/common}/compiler.h | 0
include/common/list.h | 2 +-
54 files changed, 53 insertions(+), 53 deletions(-)
rename {criu/include => include/common}/compiler.h (100%)
diff --git a/compel/include/compiler.h b/compel/include/compiler.h
index ef56d20f668e..2e49be435763 120000
--- a/compel/include/compiler.h
+++ b/compel/include/compiler.h
@@ -1 +1 @@
-../../criu/include/compiler.h
\ No newline at end of file
+../../include/common/compiler.h
\ No newline at end of file
diff --git a/criu/arch/aarch64/crtools.c b/criu/arch/aarch64/crtools.c
index 8f248b5a4e5b..951ac7530597 100644
--- a/criu/arch/aarch64/crtools.c
+++ b/criu/arch/aarch64/crtools.c
@@ -5,7 +5,7 @@
#include "asm/types.h"
#include "asm/restorer.h"
-#include "compiler.h"
+#include "common/compiler.h"
#include "ptrace.h"
#include "asm/processor-flags.h"
#include "protobuf.h"
diff --git a/criu/arch/aarch64/include/asm/bitops.h b/criu/arch/aarch64/include/asm/bitops.h
index 5a750447f25f..b1c06b8d4176 100644
--- a/criu/arch/aarch64/include/asm/bitops.h
+++ b/criu/arch/aarch64/include/asm/bitops.h
@@ -1,7 +1,7 @@
#ifndef __CR_ASM_BITOPS_H__
#define __CR_ASM_BITOPS_H__
-#include "compiler.h"
+#include "common/compiler.h"
#include "asm-generic/bitops.h"
#endif /* __CR_ASM_BITOPS_H__ */
diff --git a/criu/arch/aarch64/include/asm/string.h b/criu/arch/aarch64/include/asm/string.h
index 2c3a34fbbd3f..020a8eccda41 100644
--- a/criu/arch/aarch64/include/asm/string.h
+++ b/criu/arch/aarch64/include/asm/string.h
@@ -1,7 +1,7 @@
#ifndef __CR_ASM_STRING_H__
#define __CR_ASM_STRING_H__
-#include "compiler.h"
+#include "common/compiler.h"
#include "asm-generic/string.h"
#endif /* __CR_ASM_STRING_H__ */
diff --git a/criu/arch/arm/crtools.c b/criu/arch/arm/crtools.c
index 1168f94e92d5..71438ac043a1 100644
--- a/criu/arch/arm/crtools.c
+++ b/criu/arch/arm/crtools.c
@@ -3,7 +3,7 @@
#include "asm/types.h"
#include "asm/restorer.h"
-#include "compiler.h"
+#include "common/compiler.h"
#include "ptrace.h"
#include "asm/processor-flags.h"
#include "protobuf.h"
diff --git a/criu/arch/arm/include/asm/bitops.h b/criu/arch/arm/include/asm/bitops.h
index 5a750447f25f..b1c06b8d4176 100644
--- a/criu/arch/arm/include/asm/bitops.h
+++ b/criu/arch/arm/include/asm/bitops.h
@@ -1,7 +1,7 @@
#ifndef __CR_ASM_BITOPS_H__
#define __CR_ASM_BITOPS_H__
-#include "compiler.h"
+#include "common/compiler.h"
#include "asm-generic/bitops.h"
#endif /* __CR_ASM_BITOPS_H__ */
diff --git a/criu/arch/arm/include/asm/string.h b/criu/arch/arm/include/asm/string.h
index 2c3a34fbbd3f..020a8eccda41 100644
--- a/criu/arch/arm/include/asm/string.h
+++ b/criu/arch/arm/include/asm/string.h
@@ -1,7 +1,7 @@
#ifndef __CR_ASM_STRING_H__
#define __CR_ASM_STRING_H__
-#include "compiler.h"
+#include "common/compiler.h"
#include "asm-generic/string.h"
#endif /* __CR_ASM_STRING_H__ */
diff --git a/criu/arch/ppc64/crtools.c b/criu/arch/ppc64/crtools.c
index 9f4caced6615..dd631f4f6d23 100644
--- a/criu/arch/ppc64/crtools.c
+++ b/criu/arch/ppc64/crtools.c
@@ -10,7 +10,7 @@
#include "asm/restorer.h"
#include "cr_options.h"
-#include "compiler.h"
+#include "common/compiler.h"
#include "ptrace.h"
#include "parasite-syscall.h"
#include "log.h"
diff --git a/criu/arch/ppc64/include/asm/bitops.h b/criu/arch/ppc64/include/asm/bitops.h
index 910971981ca9..d038aa161c35 100644
--- a/criu/arch/ppc64/include/asm/bitops.h
+++ b/criu/arch/ppc64/include/asm/bitops.h
@@ -38,7 +38,7 @@
* Copied from the kernel file arch/powerpc/include/asm/bitops.h
*/
-#include "compiler.h"
+#include "common/compiler.h"
#include "asm/bitsperlong.h"
diff --git a/criu/arch/ppc64/include/asm/string.h b/criu/arch/ppc64/include/asm/string.h
index 4531b3ba6c26..93eb4281348a 100644
--- a/criu/arch/ppc64/include/asm/string.h
+++ b/criu/arch/ppc64/include/asm/string.h
@@ -1,7 +1,7 @@
#ifndef __CR_ASM_STRING_H__
#define __CR_ASM_STRING_H__
-#include "compiler.h"
+#include "common/compiler.h"
#define HAS_BUILTIN_MEMCPY
#define HAS_BUILTIN_MEMCMP
diff --git a/criu/arch/x86/cpu.c b/criu/arch/x86/cpu.c
index c60d3c2581c0..1252f7f4c74f 100644
--- a/criu/arch/x86/cpu.c
+++ b/criu/arch/x86/cpu.c
@@ -11,7 +11,7 @@
#include "asm/cpu.h"
#include "asm/fpu.h"
-#include "compiler.h"
+#include "common/compiler.h"
#include "cr_options.h"
#include "image.h"
diff --git a/criu/arch/x86/crtools.c b/criu/arch/x86/crtools.c
index 48117761bc77..b1068466e050 100644
--- a/criu/arch/x86/crtools.c
+++ b/criu/arch/x86/crtools.c
@@ -13,7 +13,7 @@
#include "asm/fpu.h"
#include "cr_options.h"
-#include "compiler.h"
+#include "common/compiler.h"
#include "restorer.h"
#include "ptrace.h"
#include "parasite-syscall.h"
diff --git a/criu/arch/x86/include/asm/fpu.h b/criu/arch/x86/include/asm/fpu.h
index 6362ebe47f79..42056e31cfa7 100644
--- a/criu/arch/x86/include/asm/fpu.h
+++ b/criu/arch/x86/include/asm/fpu.h
@@ -4,7 +4,7 @@
#include <sys/types.h>
#include <stdbool.h>
-#include "compiler.h"
+#include "common/compiler.h"
#include "asm/int.h"
#define FP_MIN_ALIGN_BYTES 64
diff --git a/criu/arch/x86/include/asm/string.h b/criu/arch/x86/include/asm/string.h
index ca4d4ab857e1..415bf5ce32bd 100644
--- a/criu/arch/x86/include/asm/string.h
+++ b/criu/arch/x86/include/asm/string.h
@@ -3,7 +3,7 @@
#define HAS_BUILTIN_MEMCPY
-#include "compiler.h"
+#include "common/compiler.h"
#include "asm-generic/string.h"
#ifdef CR_NOGLIBC
diff --git a/criu/cgroup-props.c b/criu/cgroup-props.c
index f4419b4fae74..938d7cecebd2 100644
--- a/criu/cgroup-props.c
+++ b/criu/cgroup-props.c
@@ -9,7 +9,7 @@
#include <sys/stat.h>
#include "int.h"
-#include "compiler.h"
+#include "common/compiler.h"
#include "cgroup-props.h"
#include "cr_options.h"
#include "config.h"
diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index e15f1780bf42..955ba97f80fc 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -37,7 +37,7 @@
#include "imgset.h"
#include "file-ids.h"
#include "kcmp-ids.h"
-#include "compiler.h"
+#include "common/compiler.h"
#include "crtools.h"
#include "cr_options.h"
#include "servicefd.h"
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index d4bacc48b979..564f6facae10 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -25,7 +25,7 @@
#include "types.h"
#include "ptrace.h"
-#include "compiler.h"
+#include "common/compiler.h"
#include "cr_options.h"
#include "servicefd.h"
diff --git a/criu/crtools.c b/criu/crtools.c
index bdf04e5e1f3e..a171718256e4 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -21,7 +21,7 @@
#include "int.h"
#include "page.h"
-#include "compiler.h"
+#include "common/compiler.h"
#include "crtools.h"
#include "cr_options.h"
#include "external.h"
diff --git a/criu/eventfd.c b/criu/eventfd.c
index 6426de0062d3..0aab4287e0a3 100644
--- a/criu/eventfd.c
+++ b/criu/eventfd.c
@@ -12,7 +12,7 @@
#include <sys/ioctl.h>
#include <sys/eventfd.h>
-#include "compiler.h"
+#include "common/compiler.h"
#include "imgset.h"
#include "eventfd.h"
#include "fdinfo.h"
diff --git a/criu/eventpoll.c b/criu/eventpoll.c
index bb2efbd06586..88076db8af0e 100644
--- a/criu/eventpoll.c
+++ b/criu/eventpoll.c
@@ -13,7 +13,7 @@
#include <sys/epoll.h>
#include "crtools.h"
-#include "compiler.h"
+#include "common/compiler.h"
#include "imgset.h"
#include "rst_info.h"
#include "eventpoll.h"
diff --git a/criu/file-ids.c b/criu/file-ids.c
index d3ff05ae8a55..36973cbdd939 100644
--- a/criu/file-ids.c
+++ b/criu/file-ids.c
@@ -13,7 +13,7 @@
#include "file-ids.h"
#include "rbtree.h"
#include "kcmp-ids.h"
-#include "compiler.h"
+#include "common/compiler.h"
#include "image.h"
#include "util.h"
#include "irmap.h"
diff --git a/criu/filesystems.c b/criu/filesystems.c
index 0975e10966a4..f2780ecfed3a 100644
--- a/criu/filesystems.c
+++ b/criu/filesystems.c
@@ -5,7 +5,7 @@
#include <sys/mount.h>
#include "int.h"
-#include "compiler.h"
+#include "common/compiler.h"
#include "xmalloc.h"
#include "cr_options.h"
#include "filesystems.h"
diff --git a/criu/fsnotify.c b/criu/fsnotify.c
index c8ea0e527212..6003d1bd70e2 100644
--- a/criu/fsnotify.c
+++ b/criu/fsnotify.c
@@ -22,7 +22,7 @@
#include <sys/fanotify.h>
-#include "compiler.h"
+#include "common/compiler.h"
#include "imgset.h"
#include "fsnotify.h"
#include "fdinfo.h"
diff --git a/criu/include/asm-generic/string.h b/criu/include/asm-generic/string.h
index 26d5c9bea3d8..df53e666c17e 100644
--- a/criu/include/asm-generic/string.h
+++ b/criu/include/asm-generic/string.h
@@ -1,7 +1,7 @@
#ifndef __CR_ASM_GENERIC_STRING_H__
#define __CR_ASM_GENERIC_STRING_H__
-#include "compiler.h"
+#include "common/compiler.h"
#ifndef HAS_BUILTIN_MEMCPY
static always_inline void *builtin_memcpy(void *to, const void *from, unsigned int n)
diff --git a/criu/include/bug.h b/criu/include/bug.h
index a479c673bda9..881f0daf8c2e 100644
--- a/criu/include/bug.h
+++ b/criu/include/bug.h
@@ -4,7 +4,7 @@
#include <signal.h>
#include <stdbool.h>
-#include "compiler.h"
+#include "common/compiler.h"
#include "log.h"
#ifndef BUG_ON_HANDLER
diff --git a/criu/include/err.h b/criu/include/err.h
index c5b6165a57ab..bc2c8fd8b95a 100644
--- a/criu/include/err.h
+++ b/criu/include/err.h
@@ -4,7 +4,7 @@
#ifndef __CR_ERR_H__
#define __CR_ERR_H__
-#include "compiler.h"
+#include "common/compiler.h"
/*
* The address of a block returned by malloc or realloc in GNU
diff --git a/criu/include/file-ids.h b/criu/include/file-ids.h
index e6c15c4d94c1..845cfaa9f9db 100644
--- a/criu/include/file-ids.h
+++ b/criu/include/file-ids.h
@@ -1,7 +1,7 @@
#ifndef __CR_FILE_IDS_H__
#define __CR_FILE_IDS_H__
-#include "compiler.h"
+#include "common/compiler.h"
#include "rbtree.h"
#include "images/fdinfo.pb-c.h"
diff --git a/criu/include/files.h b/criu/include/files.h
index b8f670aa69a6..da0eb7dca030 100644
--- a/criu/include/files.h
+++ b/criu/include/files.h
@@ -3,7 +3,7 @@
#include <sys/stat.h>
-#include "compiler.h"
+#include "common/compiler.h"
#include "fcntl.h"
#include "lock.h"
#include "common/list.h"
diff --git a/criu/include/image.h b/criu/include/image.h
index 65b7b0a60c20..fc1cf893c6bd 100644
--- a/criu/include/image.h
+++ b/criu/include/image.h
@@ -3,7 +3,7 @@
#include <stdbool.h>
-#include "compiler.h"
+#include "common/compiler.h"
#include "servicefd.h"
#include "image-desc.h"
#include "fcntl.h"
diff --git a/criu/include/namespaces.h b/criu/include/namespaces.h
index 126fd231952c..ece23d70044a 100644
--- a/criu/include/namespaces.h
+++ b/criu/include/namespaces.h
@@ -1,7 +1,7 @@
#ifndef __CR_NS_H__
#define __CR_NS_H__
-#include "compiler.h"
+#include "common/compiler.h"
#include "files.h"
#include "common/list.h"
diff --git a/criu/include/plugin.h b/criu/include/plugin.h
index 2b02edb246d5..82a6723d0b0b 100644
--- a/criu/include/plugin.h
+++ b/criu/include/plugin.h
@@ -2,7 +2,7 @@
#define __CR_PLUGIN_H__
#include "criu-plugin.h"
-#include "compiler.h"
+#include "common/compiler.h"
#include "common/list.h"
#define CR_PLUGIN_DEFAULT "/var/lib/criu/"
diff --git a/criu/include/protobuf.h b/criu/include/protobuf.h
index c2f685075280..0381caabe1f7 100644
--- a/criu/include/protobuf.h
+++ b/criu/include/protobuf.h
@@ -3,7 +3,7 @@
#include "protobuf-desc.h"
-#include "compiler.h"
+#include "common/compiler.h"
#include "util.h"
struct cr_img;
diff --git a/criu/include/rbtree.h b/criu/include/rbtree.h
index 2cde684cc301..00795063897a 100644
--- a/criu/include/rbtree.h
+++ b/criu/include/rbtree.h
@@ -7,7 +7,7 @@
#include <stddef.h>
-#include "compiler.h"
+#include "common/compiler.h"
#define RB_RED 0
#define RB_BLACK 1
diff --git a/criu/include/restorer.h b/criu/include/restorer.h
index 4e8af3cf5e58..301e4d235430 100644
--- a/criu/include/restorer.h
+++ b/criu/include/restorer.h
@@ -5,7 +5,7 @@
#include <limits.h>
#include <sys/resource.h>
-#include "compiler.h"
+#include "common/compiler.h"
#include "asm/fpu.h"
#include "lock.h"
#include "util.h"
diff --git a/criu/include/util.h b/criu/include/util.h
index 9c1cd6c37ffa..1504e5a042fa 100644
--- a/criu/include/util.h
+++ b/criu/include/util.h
@@ -12,7 +12,7 @@
#include <sys/statfs.h>
#include <dirent.h>
-#include "compiler.h"
+#include "common/compiler.h"
#include "xmalloc.h"
#include "bug.h"
#include "log.h"
diff --git a/criu/kerndat.c b/criu/kerndat.c
index a0513af27eb9..0a2e5c2a95e9 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -14,7 +14,7 @@
#include "kerndat.h"
#include "fs-magic.h"
#include "mem.h"
-#include "compiler.h"
+#include "common/compiler.h"
#include "sysctl.h"
#include "cr_options.h"
#include "util.h"
diff --git a/criu/log.c b/criu/log.c
index 30ca46f94149..1c5a3527aa69 100644
--- a/criu/log.c
+++ b/criu/log.c
@@ -14,7 +14,7 @@
#include "int.h"
#include "page.h"
-#include "compiler.h"
+#include "common/compiler.h"
#include "util.h"
#include "cr_options.h"
#include "servicefd.h"
diff --git a/criu/pagemap-cache.c b/criu/pagemap-cache.c
index 20e69f765e1c..aa39dacaab7b 100644
--- a/criu/pagemap-cache.c
+++ b/criu/pagemap-cache.c
@@ -3,7 +3,7 @@
#include "page.h"
#include "pagemap-cache.h"
-#include "compiler.h"
+#include "common/compiler.h"
#include "xmalloc.h"
#include "util.h"
#include "log.h"
diff --git a/criu/pie/pie-relocs.c b/criu/pie/pie-relocs.c
index 3a178ce79437..b137581a8370 100644
--- a/criu/pie/pie-relocs.c
+++ b/criu/pie/pie-relocs.c
@@ -14,7 +14,7 @@
#include "asm-generic/int.h"
-#include "compiler.h"
+#include "common/compiler.h"
#include "compel/include/uapi/compel.h"
#include "bug.h"
diff --git a/criu/pie/pie-relocs.h b/criu/pie/pie-relocs.h
index e2141dcdf0e9..1cabfe1d9dba 100644
--- a/criu/pie/pie-relocs.h
+++ b/criu/pie/pie-relocs.h
@@ -3,7 +3,7 @@
#include "compel/include/uapi/compel.h"
-#include "compiler.h"
+#include "common/compiler.h"
#include "config.h"
#ifdef CONFIG_PIEGEN
diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 04e54f14a143..b135e742ae1a 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -19,7 +19,7 @@
#include "linux/userfaultfd.h"
-#include "compiler.h"
+#include "common/compiler.h"
#include "string.h"
#include "uapi/std/syscall.h"
#include "signal.h"
diff --git a/criu/pie/util-fd.c b/criu/pie/util-fd.c
index a96d97fe8214..024381f24c04 100644
--- a/criu/pie/util-fd.c
+++ b/criu/pie/util-fd.c
@@ -5,7 +5,7 @@
#include <errno.h>
#include "int.h"
-#include "compiler.h"
+#include "common/compiler.h"
#include "log.h"
#include "string.h"
diff --git a/criu/pie/util.c b/criu/pie/util.c
index 5cae88a1b74c..598d294109b2 100644
--- a/criu/pie/util.c
+++ b/criu/pie/util.c
@@ -6,7 +6,7 @@
#include <stdbool.h>
#include "int.h"
-#include "compiler.h"
+#include "common/compiler.h"
#include "fcntl.h"
#include "log.h"
#include "util-pie.h"
diff --git a/criu/plugin.c b/criu/plugin.c
index 54cd4257b049..387b11f5ea0b 100644
--- a/criu/plugin.c
+++ b/criu/plugin.c
@@ -7,7 +7,7 @@
#include <dlfcn.h>
#include "cr_options.h"
-#include "compiler.h"
+#include "common/compiler.h"
#include "xmalloc.h"
#include "plugin.h"
#include "common/list.h"
diff --git a/criu/protobuf-desc.c b/criu/protobuf-desc.c
index a6807e2698db..41c20803723a 100644
--- a/criu/protobuf-desc.c
+++ b/criu/protobuf-desc.c
@@ -8,7 +8,7 @@
#include <arpa/inet.h>
#include <ctype.h>
-#include "compiler.h"
+#include "common/compiler.h"
#include "log.h"
#include "protobuf-desc.h"
diff --git a/criu/protobuf.c b/criu/protobuf.c
index 9a90798a1b06..d5fb23f6b20c 100644
--- a/criu/protobuf.c
+++ b/criu/protobuf.c
@@ -10,7 +10,7 @@
#include "image.h"
#include "servicefd.h"
-#include "compiler.h"
+#include "common/compiler.h"
#include "log.h"
#include "rst-malloc.h"
#include "string.h"
diff --git a/criu/ptrace.c b/criu/ptrace.c
index 646e116d0582..09f7cd9ead8a 100644
--- a/criu/ptrace.c
+++ b/criu/ptrace.c
@@ -15,7 +15,7 @@
#include <sys/wait.h>
#include "int.h"
-#include "compiler.h"
+#include "common/compiler.h"
#include "util.h"
#include "ptrace.h"
#include "pid.h"
diff --git a/criu/seize.c b/criu/seize.c
index b1c150fc60f2..3168f7fe85ab 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -10,7 +10,7 @@
#include <time.h>
#include "int.h"
-#include "compiler.h"
+#include "common/compiler.h"
#include "cr_options.h"
#include "cr-errno.h"
#include "pstree.h"
diff --git a/criu/signalfd.c b/criu/signalfd.c
index 07d0bd6da0bb..2f5db5879429 100644
--- a/criu/signalfd.c
+++ b/criu/signalfd.c
@@ -2,7 +2,7 @@
#include <signal.h>
#include <sys/signalfd.h>
-#include "compiler.h"
+#include "common/compiler.h"
#include "signalfd.h"
#include "fdinfo.h"
#include "imgset.h"
diff --git a/criu/tty.c b/criu/tty.c
index 557dd777ed01..4407107272b2 100644
--- a/criu/tty.c
+++ b/criu/tty.c
@@ -13,7 +13,7 @@
#include <linux/major.h>
#include "types.h"
-#include "compiler.h"
+#include "common/compiler.h"
#include "crtools.h"
#include "files.h"
#include "cr_options.h"
diff --git a/criu/util.c b/criu/util.c
index 63bf706cb212..1411f77f7613 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -38,7 +38,7 @@
#include "int.h"
#include "bitops.h"
#include "page.h"
-#include "compiler.h"
+#include "common/compiler.h"
#include "common/list.h"
#include "util.h"
#include "rst-malloc.h"
diff --git a/criu/vdso.c b/criu/vdso.c
index 1eb08d2b12b3..da6e9655e945 100644
--- a/criu/vdso.c
+++ b/criu/vdso.c
@@ -12,7 +12,7 @@
#include "types.h"
#include "parasite-syscall.h"
#include "parasite.h"
-#include "compiler.h"
+#include "common/compiler.h"
#include "kerndat.h"
#include "vdso.h"
#include "util.h"
diff --git a/criu/include/compiler.h b/include/common/compiler.h
similarity index 100%
rename from criu/include/compiler.h
rename to include/common/compiler.h
diff --git a/include/common/list.h b/include/common/list.h
index 8d3d610b99ee..4e33475c1520 100644
--- a/include/common/list.h
+++ b/include/common/list.h
@@ -6,7 +6,7 @@
*/
#include <stddef.h>
-#include "compiler.h"
+#include "common/compiler.h"
#define POISON_POINTER_DELTA 0
#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
--
2.7.4
More information about the CRIU
mailing list