[CRIU] [PATCH 3/5] crtools: don't include restorer.h in proc_parse.h

[Andrey Vagin]

Signed-off-by: Andrey Vagin <avagin at openvz.org>
---
 cr-dump.c             |  1 +
 include/posix-timer.h | 24 ++++++++++++++++++++++++
 include/proc_parse.h  | 13 -------------
 include/restorer.h    |  9 +--------
 proc_parse.c          |  1 +
 security.c            |  2 ++
 6 files changed, 29 insertions(+), 21 deletions(-)
 create mode 100644 include/posix-timer.h

diff --git a/cr-dump.c b/cr-dump.c
index 1106e31..7c08fa5 100644
--- a/cr-dump.c
+++ b/cr-dump.c
@@ -63,6 +63,7 @@
 #include "mem.h"
 #include "vdso.h"
 #include "page-pipe.h"
+#include "posix-timer.h"
 #include "vdso.h"
 #include "cr-service.h"
 
diff --git a/include/posix-timer.h b/include/posix-timer.h
new file mode 100644
index 0000000..70b007f
--- /dev/null
+++ b/include/posix-timer.h
@@ -0,0 +1,24 @@
+#ifndef __CR_PROC_POSIX_TIMER_H__
+#define __CR_PROC_POSIX_TIMER_H__
+
+struct str_posix_timer {
+	long it_id;
+	int clock_id;
+	int si_signo;
+	int it_sigev_notify;
+	void * sival_ptr;
+};
+
+struct proc_posix_timer {
+	struct list_head list;
+	struct str_posix_timer spt;
+};
+
+struct proc_posix_timers_stat {
+	int timer_n;
+	struct list_head timers;
+};
+
+extern int parse_posix_timers(pid_t pid, struct proc_posix_timers_stat * args);
+
+#endif
diff --git a/include/proc_parse.h b/include/proc_parse.h
index 71bf00b..553a8bb 100644
--- a/include/proc_parse.h
+++ b/include/proc_parse.h
@@ -3,7 +3,6 @@
 
 #include <sys/types.h>
 #include "asm/types.h"
-#include "restorer.h"
 #include "image.h"
 #include "list.h"
 
@@ -128,16 +127,6 @@ struct mount_info {
 	struct list_head postpone;
 };
 
-struct proc_posix_timer {
-	struct list_head list;
-	struct str_posix_timer spt;
-};
-
-struct proc_posix_timers_stat {
-	int timer_n;
-	struct list_head timers;
-};
-
 extern struct mount_info *mnt_entry_alloc();
 extern void mnt_entry_free(struct mount_info *mi);
 
@@ -162,8 +151,6 @@ extern int parse_fdinfo(int fd, int type,
 extern int parse_cpuinfo_features(int (*handler)(char *tok));
 extern int parse_file_locks(void);
 
-extern int parse_posix_timers(pid_t pid, struct proc_posix_timers_stat * args);
-
 struct pid;
 extern int parse_threads(int pid, struct pid **_t, int *_n);
 
diff --git a/include/restorer.h b/include/restorer.h
index 3458a5b..247ac2b 100644
--- a/include/restorer.h
+++ b/include/restorer.h
@@ -14,6 +14,7 @@
 #include "crtools.h"
 #include "asm/restorer.h"
 
+#include "posix-timer.h"
 #include "vdso.h"
 
 #include <time.h>
@@ -55,14 +56,6 @@ struct rst_sched_param {
 	int prio;
 };
 
-struct str_posix_timer {
-	long it_id;
-	int clock_id;
-	int si_signo;
-	int it_sigev_notify;
-	void * sival_ptr;
-};
-
 struct restore_posix_timer {
 	struct str_posix_timer spt;
 	struct itimerspec val;
diff --git a/proc_parse.c b/proc_parse.c
index 96d9055..ea59cf7 100644
--- a/proc_parse.c
+++ b/proc_parse.c
@@ -18,6 +18,7 @@
 #include "file-lock.h"
 #include "pstree.h"
 #include "fsnotify.h"
+#include "posix-timer.h"
 #include "kerndat.h"
 #include "vdso.h"
 
diff --git a/security.c b/security.c
index 1901145..27eaf2e 100644
--- a/security.c
+++ b/security.c
@@ -3,6 +3,8 @@
 #include "proc_parse.h"
 #include "log.h"
 
+#include "protobuf/creds.pb-c.h"
+
 /*
  * UID and GID of user requesting for C/R
  */
-- 
1.8.3.1