[CRIU] [PATCH 48/78] infect: Move errno.h to compel

Cyrill Gorcunov gorcunov at openvz.org
Mon Nov 7 08:36:33 PST 2016


From: Pavel Emelyanov <xemul at virtuozzo.com>

Signed-off-by: Pavel Emelyanov <xemul at virtuozzo.com>
---
 {criu => compel}/include/errno.h | 4 ++--
 criu/arch/aarch64/infect.c       | 2 +-
 criu/arch/arm/crtools.c          | 1 -
 criu/arch/arm/infect.c           | 2 +-
 criu/arch/ppc64/crtools.c        | 1 -
 criu/arch/ppc64/infect.c         | 2 +-
 criu/arch/x86/crtools.c          | 1 -
 criu/arch/x86/infect.c           | 2 +-
 8 files changed, 6 insertions(+), 9 deletions(-)
 rename {criu => compel}/include/errno.h (72%)

diff --git a/criu/include/errno.h b/compel/include/errno.h
similarity index 72%
rename from criu/include/errno.h
rename to compel/include/errno.h
index 5c2322e9fae9..d41fd5391de9 100644
--- a/criu/include/errno.h
+++ b/compel/include/errno.h
@@ -1,5 +1,5 @@
-#ifndef __CR_ERRNO_H__
-#define __CR_ERRNO_H__
+#ifndef __COMPEL_ERRNO_H__
+#define __COMPEL_ERRNO_H__
 
 #define ERESTARTSYS		512
 #define ERESTARTNOINTR		513
diff --git a/criu/arch/aarch64/infect.c b/criu/arch/aarch64/infect.c
index 263ea5a55f95..79f64d095071 100644
--- a/criu/arch/aarch64/infect.c
+++ b/criu/arch/aarch64/infect.c
@@ -8,7 +8,7 @@
 #include "criu-log.h"
 #include "kerndat.h"
 #include "parasite-syscall.h"
-#include "errno.h"
+#include "compel/include/errno.h"
 #include "infect.h"
 #include "infect-priv.h"
 
diff --git a/criu/arch/arm/crtools.c b/criu/arch/arm/crtools.c
index 8ce1e6619794..6c95fe8535e4 100644
--- a/criu/arch/arm/crtools.c
+++ b/criu/arch/arm/crtools.c
@@ -16,7 +16,6 @@
 #include "elf.h"
 #include "parasite-syscall.h"
 #include "restorer.h"
-#include "errno.h"
 #include "kerndat.h"
 #include "infect.h"
 
diff --git a/criu/arch/arm/infect.c b/criu/arch/arm/infect.c
index 50d1d5b68877..1ad01472f30f 100644
--- a/criu/arch/arm/infect.c
+++ b/criu/arch/arm/infect.c
@@ -6,7 +6,7 @@
 #include "criu-log.h"
 #include "kerndat.h"
 #include "parasite-syscall.h"
-#include "errno.h"
+#include "compel/include/errno.h"
 #include "infect.h"
 #include "infect-priv.h"
 
diff --git a/criu/arch/ppc64/crtools.c b/criu/arch/ppc64/crtools.c
index e634c7b7124c..cd4df64175f8 100644
--- a/criu/arch/ppc64/crtools.c
+++ b/criu/arch/ppc64/crtools.c
@@ -17,7 +17,6 @@
 #include "log.h"
 #include "util.h"
 #include "cpu.h"
-#include "errno.h"
 #include "infect.h"
 
 #include "protobuf.h"
diff --git a/criu/arch/ppc64/infect.c b/criu/arch/ppc64/infect.c
index 029509ee3234..feefc1448572 100644
--- a/criu/arch/ppc64/infect.c
+++ b/criu/arch/ppc64/infect.c
@@ -6,7 +6,7 @@
 #include "asm/types.h"
 #include "ptrace.h"
 #include "parasite-syscall.h"
-#include "errno.h"
+#include "compel/include/errno.h"
 #include "criu-log.h"
 #include "infect.h"
 #include "infect-priv.h"
diff --git a/criu/arch/x86/crtools.c b/criu/arch/x86/crtools.c
index 6b0dedee8441..0f0aa899f2fb 100644
--- a/criu/arch/x86/crtools.c
+++ b/criu/arch/x86/crtools.c
@@ -19,7 +19,6 @@
 #include "log.h"
 #include "util.h"
 #include "cpu.h"
-#include "errno.h"
 #include "uapi/std/syscall-codes.h"
 #include "kerndat.h"
 #include "infect.h"
diff --git a/criu/arch/x86/infect.c b/criu/arch/x86/infect.c
index da387feb168f..4a8ac1eab866 100644
--- a/criu/arch/x86/infect.c
+++ b/criu/arch/x86/infect.c
@@ -5,12 +5,12 @@
 #include <sys/mman.h>
 #include <sys/user.h>
 
-#include "errno.h"
 #include "asm/processor-flags.h"
 #include "asm/fpu.h"
 #include "asm/cpu.h"
 #include "kerndat.h"
 
+#include "compel/include/errno.h"
 #include "uapi/std/syscall-codes.h"
 #include "compel/include/asm/syscall.h"
 #include "compel/include/asm/ptrace.h"
-- 
2.7.4



More information about the CRIU mailing list