[CRIU] [PATCH 2/3] common: Move compiler.h into
Cyrill Gorcunov
gorcunov at openvz.org
Thu Oct 20 06:21:08 PDT 2016
Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
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 9e0bd9999ad4..8a4f6a556ded 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 5325ff0e380e..35e0b3eefe26 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 174b98769a75..b824920e880d 100644
--- a/criu/cgroup-props.c
+++ b/criu/cgroup-props.c
@@ -8,7 +8,7 @@
#include <sys/types.h>
#include <sys/stat.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 0d3fe3e3416b..29eea9f1120d 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 974be4ec1ca3..773de6270457 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -25,7 +25,7 @@
#include <sys/sendfile.h>
#include "ptrace.h"
-#include "compiler.h"
+#include "common/compiler.h"
#include "asm/types.h"
#include "asm/restorer.h"
diff --git a/criu/crtools.c b/criu/crtools.c
index 29b7e57ad195..e0ae5d6b1aa9 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -21,7 +21,7 @@
#include "asm/types.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 f12088671700..72cc5afbb69e 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 "asm/types.h"
#include "imgset.h"
#include "eventfd.h"
diff --git a/criu/eventpoll.c b/criu/eventpoll.c
index db1e2a222902..51ba9540f2e9 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 "asm/types.h"
#include "imgset.h"
#include "rst_info.h"
diff --git a/criu/file-ids.c b/criu/file-ids.c
index f23924a0516b..9a27cbb59d6b 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 24879c99e6e7..5a01d709622d 100644
--- a/criu/filesystems.c
+++ b/criu/filesystems.c
@@ -5,7 +5,7 @@
#include <sys/mount.h>
#include "asm/types.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 c9dade14c5b6..dbf9708cc6a2 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 "asm/types.h"
#include "imgset.h"
#include "fsnotify.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 2673543bdf26..609f18dc361b 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 "asm/types.h"
#include "rbtree.h"
diff --git a/criu/include/files.h b/criu/include/files.h
index 2ea7116d573e..adc7fcb4fbae 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 "asm/types.h"
#include "fcntl.h"
#include "lock.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 821fb028e0a1..a41acdf46a3b 100644
--- a/criu/include/protobuf.h
+++ b/criu/include/protobuf.h
@@ -4,7 +4,7 @@
#include "protobuf-desc.h"
#include "asm/types.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 f6082103298f..fab2bc57ef7b 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"
#include "asm/types.h"
#define RB_RED 0
diff --git a/criu/include/restorer.h b/criu/include/restorer.h
index bfa3e8fec513..4cb6a9322b6d 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/types.h"
#include "asm/fpu.h"
#include "lock.h"
diff --git a/criu/include/util.h b/criu/include/util.h
index 5b7cad1134c1..9abf21d9f1ba 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 "asm/types.h"
#include "xmalloc.h"
#include "bug.h"
diff --git a/criu/kerndat.c b/criu/kerndat.c
index a4ec2f778c90..d6f9ed25eefe 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -13,7 +13,7 @@
#include "kerndat.h"
#include "fs-magic.h"
#include "mem.h"
-#include "compiler.h"
+#include "common/compiler.h"
#include "sysctl.h"
#include "asm/types.h"
#include "asm/restorer.h"
diff --git a/criu/log.c b/criu/log.c
index 6dd85307415a..58c2e36dd6ad 100644
--- a/criu/log.c
+++ b/criu/log.c
@@ -12,7 +12,7 @@
#include <fcntl.h>
-#include "compiler.h"
+#include "common/compiler.h"
#include "asm/types.h"
#include "util.h"
#include "cr_options.h"
diff --git a/criu/pagemap-cache.c b/criu/pagemap-cache.c
index 5a8def94ea76..d8b27a4ed1d9 100644
--- a/criu/pagemap-cache.c
+++ b/criu/pagemap-cache.c
@@ -2,7 +2,7 @@
#include <fcntl.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 3fcdc8b4586b..5c4da8ab3f8a 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 "asm/string.h"
#include "asm/types.h"
#include "uapi/std/syscall.h"
diff --git a/criu/pie/util-fd.c b/criu/pie/util-fd.c
index 78252cd22241..1573c7708e21 100644
--- a/criu/pie/util-fd.c
+++ b/criu/pie/util-fd.c
@@ -4,7 +4,7 @@
#include <errno.h>
-#include "compiler.h"
+#include "common/compiler.h"
#include "log.h"
#include "asm/string.h"
#include "asm/types.h"
diff --git a/criu/pie/util.c b/criu/pie/util.c
index 4dace66b03b6..d78337e71555 100644
--- a/criu/pie/util.c
+++ b/criu/pie/util.c
@@ -4,7 +4,7 @@
#include <unistd.h>
#include <errno.h>
-#include "compiler.h"
+#include "common/compiler.h"
#include "asm/string.h"
#include "asm/types.h"
#include "fcntl.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 9352a76cc309..4d8aaa39d965 100644
--- a/criu/protobuf-desc.c
+++ b/criu/protobuf-desc.c
@@ -10,7 +10,7 @@
#include "asm/types.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 adcfd4f4fb91..c12d0b42ed27 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 "asm/types.h"
#include "log.h"
#include "rst-malloc.h"
diff --git a/criu/ptrace.c b/criu/ptrace.c
index 155600d25760..7a83f83525ca 100644
--- a/criu/ptrace.c
+++ b/criu/ptrace.c
@@ -14,7 +14,7 @@
#include <sys/resource.h>
#include <sys/wait.h>
-#include "compiler.h"
+#include "common/compiler.h"
#include "asm/types.h"
#include "util.h"
#include "ptrace.h"
diff --git a/criu/seize.c b/criu/seize.c
index ef1b3563ca03..72c4ce6a5da0 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -9,7 +9,7 @@
#include <sys/wait.h>
#include <time.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 c99227420171..a2942039bfaa 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 "asm/types.h"
#include "signalfd.h"
#include "fdinfo.h"
diff --git a/criu/tty.c b/criu/tty.c
index 31db54bf6d21..de7f56c17573 100644
--- a/criu/tty.c
+++ b/criu/tty.c
@@ -12,7 +12,7 @@
#include <termios.h>
#include <linux/major.h>
-#include "compiler.h"
+#include "common/compiler.h"
#include "asm/types.h"
#include "crtools.h"
diff --git a/criu/util.c b/criu/util.c
index 95817c32a874..1976f9586c4c 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -35,7 +35,7 @@
#include <sched.h>
#include <ctype.h>
-#include "compiler.h"
+#include "common/compiler.h"
#include "asm/types.h"
#include "common/list.h"
#include "util.h"
diff --git a/criu/vdso.c b/criu/vdso.c
index 057b2adb4d74..5b9e0a13a4e7 100644
--- a/criu/vdso.c
+++ b/criu/vdso.c
@@ -14,7 +14,7 @@
#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