[CRIU] [PATCH 07/10] image.h: Remove its inclusion from wherever possible

Pavel Emelyanov xemul at virtuozzo.com
Fri May 20 09:54:27 PDT 2016


Signed-off-by: Pavel Emelyanov <xemul at virtuozzo.com>
---
 criu/arch/ppc64/cpu.c     | 2 +-
 criu/arch/x86/cpu.c       | 2 +-
 criu/include/files-reg.h  | 1 -
 criu/include/files.h      | 1 -
 criu/include/proc_parse.h | 1 -
 criu/include/pstree.h     | 1 -
 criu/include/restorer.h   | 1 -
 criu/lsm.c                | 1 +
 criu/seize.c              | 1 +
 9 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/criu/arch/ppc64/cpu.c b/criu/arch/ppc64/cpu.c
index 3f6041e..222bc62 100644
--- a/criu/arch/ppc64/cpu.c
+++ b/criu/arch/ppc64/cpu.c
@@ -9,7 +9,7 @@
 #include "asm/cpu.h"
 
 #include "cr_options.h"
-#include "proc_parse.h"
+#include "image.h"
 #include "util.h"
 #include "log.h"
 #include "cpu.h"
diff --git a/criu/arch/x86/cpu.c b/criu/arch/x86/cpu.c
index 0b90c0c..c60d3c2 100644
--- a/criu/arch/x86/cpu.c
+++ b/criu/arch/x86/cpu.c
@@ -14,7 +14,7 @@
 #include "compiler.h"
 
 #include "cr_options.h"
-#include "proc_parse.h"
+#include "image.h"
 #include "util.h"
 #include "log.h"
 
diff --git a/criu/include/files-reg.h b/criu/include/files-reg.h
index 9e5944d..7823f91 100644
--- a/criu/include/files-reg.h
+++ b/criu/include/files-reg.h
@@ -3,7 +3,6 @@
 
 #include "asm/types.h"
 #include "files.h"
-#include "image.h"
 
 #include "images/regfile.pb-c.h"
 #include "images/ghost-file.pb-c.h"
diff --git a/criu/include/files.h b/criu/include/files.h
index 1894f09..2e312f0 100644
--- a/criu/include/files.h
+++ b/criu/include/files.h
@@ -6,7 +6,6 @@
 #include "fcntl.h"
 #include "lock.h"
 #include "list.h"
-#include "image.h"
 #include "pid.h"
 #include "rst_info.h"
 
diff --git a/criu/include/proc_parse.h b/criu/include/proc_parse.h
index 5208ba2..ee2d9df 100644
--- a/criu/include/proc_parse.h
+++ b/criu/include/proc_parse.h
@@ -3,7 +3,6 @@
 
 #include <sys/types.h>
 #include "asm/types.h"
-#include "image.h"
 #include "list.h"
 
 #include "images/eventfd.pb-c.h"
diff --git a/criu/include/pstree.h b/criu/include/pstree.h
index 5998295..2af3604 100644
--- a/criu/include/pstree.h
+++ b/criu/include/pstree.h
@@ -3,7 +3,6 @@
 
 #include "list.h"
 #include "pid.h"
-#include "image.h"
 #include "images/core.pb-c.h"
 
 /*
diff --git a/criu/include/restorer.h b/criu/include/restorer.h
index 8c3923d..2600678 100644
--- a/criu/include/restorer.h
+++ b/criu/include/restorer.h
@@ -8,7 +8,6 @@
 #include "compiler.h"
 #include "asm/types.h"
 #include "asm/fpu.h"
-#include "image.h"
 #include "lock.h"
 #include "util.h"
 #include "asm/restorer.h"
diff --git a/criu/lsm.c b/criu/lsm.c
index 5443860..da90fb1 100644
--- a/criu/lsm.c
+++ b/criu/lsm.c
@@ -1,6 +1,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <fcntl.h>
 #include <sys/types.h>
 #include <unistd.h>
 
diff --git a/criu/seize.c b/criu/seize.c
index 0ea7a28..09eb65c 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -3,6 +3,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <fcntl.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/wait.h>
-- 
2.5.0



More information about the CRIU mailing list