From patchwork Thu Oct 27 16:24:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [2/3] headers: Move err.h to common From: Pavel Emelyanov X-Patchwork-Id: 2259 Message-Id: <58122A3B.3090107@virtuozzo.com> To: CRIU Date: Thu, 27 Oct 2016 19:24:27 +0300 Signed-off-by: Pavel Emelyanov --- criu/external.c | 2 +- criu/include/bfd.h | 2 +- criu/include/util.h | 2 +- {criu/include => include/common}/err.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) rename {criu/include => include/common}/err.h (94%) diff --git a/criu/external.c b/criu/external.c index 6f2d5e9..96e6768 100644 --- a/criu/external.c +++ b/criu/external.c @@ -1,4 +1,4 @@ -#include "err.h" +#include "common/err.h" #include "common/list.h" #include "cr_options.h" #include "xmalloc.h" diff --git a/criu/include/bfd.h b/criu/include/bfd.h index e9b4d53..9f4bdb2 100644 --- a/criu/include/bfd.h +++ b/criu/include/bfd.h @@ -1,7 +1,7 @@ #ifndef __CR_BFD_H__ #define __CR_BFD_H__ -#include "err.h" +#include "common/err.h" struct bfd_buf; struct xbuf { diff --git a/criu/include/util.h b/criu/include/util.h index 68ff103..8eaee33 100644 --- a/criu/include/util.h +++ b/criu/include/util.h @@ -17,7 +17,7 @@ #include "xmalloc.h" #include "common/bug.h" #include "log.h" -#include "err.h" +#include "common/err.h" #define PREF_SHIFT_OP(pref, op, size) ((size) op (pref ##BYTES_SHIFT)) #define KBYTES_SHIFT 10 diff --git a/criu/include/err.h b/include/common/err.h similarity index 94% rename from criu/include/err.h rename to include/common/err.h index bc2c8fd..a370daf 100644 --- a/criu/include/err.h +++ b/include/common/err.h @@ -1,8 +1,8 @@ /* * Adopted from linux kernel */ -#ifndef __CR_ERR_H__ -#define __CR_ERR_H__ +#ifndef __CR_COMMON_ERR_H__ +#define __CR_COMMON_ERR_H__ #include "common/compiler.h"