From d65e4cf9a8ef2fc1ad0db186c1060fc86e91c6ad Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@virtuozzo.com>
Date: Thu, 27 Oct 2016 19:24:27 +0300
Subject: [PATCH] headers: Move err.h to common

travis-ci: success for headers: Finalize include/common/
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
---
 criu/include/bfd.h                     | 2 +-
 criu/include/util.h                    | 2 +-
 {criu/include => include/common}/err.h | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename {criu/include => include/common}/err.h (94%)

diff --git a/criu/include/bfd.h b/criu/include/bfd.h
index e9b4d53a4..9f4bdb27b 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 68ff10316..8eaee3339 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 bc2c8fd8b..a370daf6b 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"