[CRIU] [PATCH 02/13] Hide asm/int.h from srources
Pavel Emelyanov
xemul at virtuozzo.com
Thu Oct 20 13:35:16 PDT 2016
Signed-off-by: Pavel Emelyanov <xemul at virtuozzo.com>
---
criu/bfd.c | 2 +-
criu/cgroup-props.c | 2 +-
criu/cr-service.c | 2 +-
criu/crtools.c | 2 +-
criu/file-ids.c | 2 +-
criu/filesystems.c | 2 +-
criu/include/cgroup.h | 3 +--
criu/include/image-desc.h | 2 +-
criu/include/int.h | 4 ++++
criu/include/mem.h | 2 +-
criu/include/pagemap-cache.h | 2 +-
criu/include/prctl.h | 2 +-
criu/include/shmem.h | 2 +-
criu/ipc_ns.c | 2 +-
criu/irmap.c | 2 +-
criu/kcmp-ids.c | 2 +-
criu/kerndat.c | 2 +-
criu/libnetlink.c | 2 +-
criu/log.c | 2 +-
criu/lsm.c | 2 +-
criu/mount.c | 2 +-
criu/netfilter.c | 2 +-
criu/page-pipe.c | 2 +-
criu/path.c | 2 +-
criu/pie/util-fd.c | 2 +-
criu/pie/util.c | 2 +-
criu/proc_parse.c | 2 +-
criu/ptrace.c | 2 +-
criu/seize.c | 2 +-
criu/sk-tcp.c | 2 +-
criu/sockets.c | 2 +-
criu/timerfd.c | 2 +-
criu/util.c | 2 +-
criu/uts_ns.c | 2 +-
34 files changed, 37 insertions(+), 34 deletions(-)
create mode 100644 criu/include/int.h
diff --git a/criu/bfd.c b/criu/bfd.c
index d13b3ff..51d50c1 100644
--- a/criu/bfd.c
+++ b/criu/bfd.c
@@ -7,7 +7,7 @@
#include <sys/uio.h>
#include <errno.h>
-#include "asm/int.h"
+#include "int.h"
#include "bug.h"
#include "log.h"
#include "bfd.h"
diff --git a/criu/cgroup-props.c b/criu/cgroup-props.c
index 8e1fc25..7de71c1 100644
--- a/criu/cgroup-props.c
+++ b/criu/cgroup-props.c
@@ -8,7 +8,7 @@
#include <sys/types.h>
#include <sys/stat.h>
-#include "asm/int.h"
+#include "int.h"
#include "compiler.h"
#include "cgroup-props.h"
#include "cr_options.h"
diff --git a/criu/cr-service.c b/criu/cr-service.c
index 53e8b8a..3030caa 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -15,7 +15,7 @@
#include <arpa/inet.h>
#include <sched.h>
-#include "asm/int.h"
+#include "int.h"
#include "crtools.h"
#include "cr_options.h"
#include "external.h"
diff --git a/criu/crtools.c b/criu/crtools.c
index 3da2cee..225c083 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -19,7 +19,7 @@
#include <dlfcn.h>
-#include "asm/int.h"
+#include "int.h"
#include "compiler.h"
#include "crtools.h"
#include "cr_options.h"
diff --git a/criu/file-ids.c b/criu/file-ids.c
index a205229..d3ff05a 100644
--- a/criu/file-ids.c
+++ b/criu/file-ids.c
@@ -9,7 +9,7 @@
#include <sys/stat.h>
#include <sys/types.h>
-#include "asm/int.h"
+#include "int.h"
#include "file-ids.h"
#include "rbtree.h"
#include "kcmp-ids.h"
diff --git a/criu/filesystems.c b/criu/filesystems.c
index 75a6980..0975e10 100644
--- a/criu/filesystems.c
+++ b/criu/filesystems.c
@@ -4,7 +4,7 @@
#include <fcntl.h>
#include <sys/mount.h>
-#include "asm/int.h"
+#include "int.h"
#include "compiler.h"
#include "xmalloc.h"
#include "cr_options.h"
diff --git a/criu/include/cgroup.h b/criu/include/cgroup.h
index 3c4321d..949266d 100644
--- a/criu/include/cgroup.h
+++ b/criu/include/cgroup.h
@@ -1,8 +1,7 @@
#ifndef __CR_CGROUP_H__
#define __CR_CGROUP_H__
-#include "asm/int.h"
-
+#include "int.h"
#include "images/core.pb-c.h"
struct pstree_item;
diff --git a/criu/include/image-desc.h b/criu/include/image-desc.h
index bb69616..09d187d 100644
--- a/criu/include/image-desc.h
+++ b/criu/include/image-desc.h
@@ -1,7 +1,7 @@
#ifndef __CR_IMAGE_DESC_H__
#define __CR_IMAGE_DESC_H__
-#include "asm/int.h"
+#include "int.h"
enum {
CR_FD_INVENTORY,
diff --git a/criu/include/int.h b/criu/include/int.h
new file mode 100644
index 0000000..5776ab6
--- /dev/null
+++ b/criu/include/int.h
@@ -0,0 +1,4 @@
+#ifndef __CR_INC_INT_H__
+#define __CR_INC_INT_H__
+#include "asm/int.h"
+#endif
diff --git a/criu/include/mem.h b/criu/include/mem.h
index f89947b..8dd9ba8 100644
--- a/criu/include/mem.h
+++ b/criu/include/mem.h
@@ -2,7 +2,7 @@
#define __CR_MEM_H__
#include <stdbool.h>
-#include "asm/int.h"
+#include "int.h"
#include "vma.pb-c.h"
struct parasite_ctl;
diff --git a/criu/include/pagemap-cache.h b/criu/include/pagemap-cache.h
index e088090..29b284b 100644
--- a/criu/include/pagemap-cache.h
+++ b/criu/include/pagemap-cache.h
@@ -3,7 +3,7 @@
#include <sys/types.h>
#include "asm/page.h"
-#include "asm/int.h"
+#include "int.h"
#include "list.h"
diff --git a/criu/include/prctl.h b/criu/include/prctl.h
index b48d952..79c3bd8 100644
--- a/criu/include/prctl.h
+++ b/criu/include/prctl.h
@@ -1,7 +1,7 @@
#ifndef __CR_PRCTL_H__
#define __CR_PRCTL_H__
-#include "asm/int.h"
+#include "int.h"
#ifndef PR_SET_NAME
# define PR_SET_NAME 15
diff --git a/criu/include/shmem.h b/criu/include/shmem.h
index 11edccb..3d190bd 100644
--- a/criu/include/shmem.h
+++ b/criu/include/shmem.h
@@ -1,7 +1,7 @@
#ifndef __CR_SHMEM_H__
#define __CR_SHMEM_H__
-#include "asm/int.h"
+#include "int.h"
#include "lock.h"
#include "images/vma.pb-c.h"
diff --git a/criu/ipc_ns.c b/criu/ipc_ns.c
index 71ccd94..ae36fef 100644
--- a/criu/ipc_ns.c
+++ b/criu/ipc_ns.c
@@ -8,7 +8,7 @@
#include <sys/shm.h>
#include <sched.h>
-#include "asm/int.h"
+#include "int.h"
#include "util.h"
#include "cr_options.h"
#include "imgset.h"
diff --git a/criu/irmap.c b/criu/irmap.c
index 3da658f..a59f301 100644
--- a/criu/irmap.c
+++ b/criu/irmap.c
@@ -16,7 +16,7 @@
#include <sys/stat.h>
#include <unistd.h>
-#include "asm/int.h"
+#include "int.h"
#include "xmalloc.h"
#include "irmap.h"
#include "mount.h"
diff --git a/criu/kcmp-ids.c b/criu/kcmp-ids.c
index 7f7c4cc..fcca988 100644
--- a/criu/kcmp-ids.c
+++ b/criu/kcmp-ids.c
@@ -2,7 +2,7 @@
#include <stdlib.h>
#include <sys/syscall.h>
-#include "asm/int.h"
+#include "int.h"
#include "rbtree.h"
#include "util.h"
#include "kcmp-ids.h"
diff --git a/criu/kerndat.c b/criu/kerndat.c
index 3d6d338..902601e 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -8,7 +8,7 @@
#include <errno.h>
#include <sys/syscall.h>
-#include "asm/int.h"
+#include "int.h"
#include "log.h"
#include "bug.h"
#include "kerndat.h"
diff --git a/criu/libnetlink.c b/criu/libnetlink.c
index 5a91e68..4f94a48 100644
--- a/criu/libnetlink.c
+++ b/criu/libnetlink.c
@@ -7,7 +7,7 @@
#include <string.h>
#include <unistd.h>
-#include "asm/int.h"
+#include "int.h"
#include "libnetlink.h"
#include "util.h"
diff --git a/criu/log.c b/criu/log.c
index 6028304..6a3ed4f 100644
--- a/criu/log.c
+++ b/criu/log.c
@@ -12,7 +12,7 @@
#include <fcntl.h>
-#include "asm/int.h"
+#include "int.h"
#include "asm/page.h"
#include "compiler.h"
#include "util.h"
diff --git a/criu/lsm.c b/criu/lsm.c
index 7df2411..e5fb704 100644
--- a/criu/lsm.c
+++ b/criu/lsm.c
@@ -5,7 +5,7 @@
#include <sys/types.h>
#include <unistd.h>
-#include "asm/int.h"
+#include "int.h"
#include "config.h"
#include "pstree.h"
#include "util.h"
diff --git a/criu/mount.c b/criu/mount.c
index 3edeb27..bef1cc3 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -11,7 +11,7 @@
#include <sys/wait.h>
#include <sched.h>
-#include "asm/int.h"
+#include "int.h"
#include "cr_options.h"
#include "util.h"
#include "util-pie.h"
diff --git a/criu/netfilter.c b/criu/netfilter.c
index d5ccf7b..07724c8 100644
--- a/criu/netfilter.c
+++ b/criu/netfilter.c
@@ -5,7 +5,7 @@
#include <sys/wait.h>
#include <stdlib.h>
-#include "asm/int.h"
+#include "int.h"
#include "util.h"
#include "list.h"
#include "files.h"
diff --git a/criu/page-pipe.c b/criu/page-pipe.c
index a1ac4b6..79f0078 100644
--- a/criu/page-pipe.c
+++ b/criu/page-pipe.c
@@ -3,7 +3,7 @@
#undef LOG_PREFIX
#define LOG_PREFIX "page-pipe: "
-#include "asm/int.h"
+#include "int.h"
#include "asm/page.h"
#include "config.h"
#include "util.h"
diff --git a/criu/path.c b/criu/path.c
index 5bbdfbf..39da84b 100644
--- a/criu/path.c
+++ b/criu/path.c
@@ -2,7 +2,7 @@
#include <stdio.h>
#include <stdbool.h>
-#include "asm/int.h"
+#include "int.h"
#include "mount.h"
#include "path.h"
#include "bug.h"
diff --git a/criu/pie/util-fd.c b/criu/pie/util-fd.c
index a3fc61b..1ef7dd2 100644
--- a/criu/pie/util-fd.c
+++ b/criu/pie/util-fd.c
@@ -4,7 +4,7 @@
#include <stdbool.h>
#include <errno.h>
-#include "asm/int.h"
+#include "int.h"
#include "compiler.h"
#include "log.h"
#include "asm/string.h"
diff --git a/criu/pie/util.c b/criu/pie/util.c
index 012afd5..25fe745 100644
--- a/criu/pie/util.c
+++ b/criu/pie/util.c
@@ -5,7 +5,7 @@
#include <errno.h>
#include <stdbool.h>
-#include "asm/int.h"
+#include "int.h"
#include "compiler.h"
#include "asm/string.h"
#include "fcntl.h"
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index ec66d5b..76dd97e 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -10,7 +10,7 @@
#include <ctype.h>
#include <linux/fs.h>
-#include "asm/int.h"
+#include "int.h"
#include "list.h"
#include "util.h"
#include "mount.h"
diff --git a/criu/ptrace.c b/criu/ptrace.c
index bc402d6..646e116 100644
--- a/criu/ptrace.c
+++ b/criu/ptrace.c
@@ -14,7 +14,7 @@
#include <sys/resource.h>
#include <sys/wait.h>
-#include "asm/int.h"
+#include "int.h"
#include "compiler.h"
#include "util.h"
#include "ptrace.h"
diff --git a/criu/seize.c b/criu/seize.c
index 69fab64..b1c150f 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -9,7 +9,7 @@
#include <sys/wait.h>
#include <time.h>
-#include "asm/int.h"
+#include "int.h"
#include "compiler.h"
#include "cr_options.h"
#include "cr-errno.h"
diff --git a/criu/sk-tcp.c b/criu/sk-tcp.c
index 2f95cdb..a643058 100644
--- a/criu/sk-tcp.c
+++ b/criu/sk-tcp.c
@@ -8,7 +8,7 @@
#include "../soccr/soccr.h"
-#include "asm/int.h"
+#include "int.h"
#include "cr_options.h"
#include "util.h"
#include "list.h"
diff --git a/criu/sockets.c b/criu/sockets.c
index df5d70a..88634bf 100644
--- a/criu/sockets.c
+++ b/criu/sockets.c
@@ -9,7 +9,7 @@
#include <string.h>
#include <netinet/in.h>
-#include "asm/int.h"
+#include "int.h"
#include "asm/bitops.h"
#include "libnetlink.h"
#include "sockets.h"
diff --git a/criu/timerfd.c b/criu/timerfd.c
index fcebe42..3ff9dae 100644
--- a/criu/timerfd.c
+++ b/criu/timerfd.c
@@ -5,7 +5,7 @@
#include <sys/timerfd.h>
#include <sys/ioctl.h>
-#include "asm/int.h"
+#include "int.h"
#include "protobuf.h"
#include "images/timerfd.pb-c.h"
diff --git a/criu/util.c b/criu/util.c
index 4c6d86a..7affad5 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -35,7 +35,7 @@
#include <sched.h>
#include <ctype.h>
-#include "asm/int.h"
+#include "int.h"
#include "asm/bitops.h"
#include "asm/page.h"
#include "compiler.h"
diff --git a/criu/uts_ns.c b/criu/uts_ns.c
index d1bc0cf..ce1d577 100644
--- a/criu/uts_ns.c
+++ b/criu/uts_ns.c
@@ -4,7 +4,7 @@
#include <string.h>
#include <sched.h>
-#include "asm/int.h"
+#include "int.h"
#include "util.h"
#include "namespaces.h"
#include "sysctl.h"
--
2.1.4
More information about the CRIU
mailing list