[CRIU] [PATCH 06/22] compel: Adjust ifdefs naming

[Cyrill Gorcunov]

To unify scheme.

Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 compel/include/uapi/compel/plugins.h                           | 6 +++---
 compel/plugins/include/std-priv.h                              | 6 +++---
 compel/plugins/include/uapi/compel/plugins/plugin-fds.h        | 7 +++----
 compel/plugins/include/uapi/compel/plugins/plugin-shmem.h      | 6 +++---
 compel/plugins/include/uapi/compel/plugins/plugin-std.h        | 6 +++---
 compel/plugins/include/uapi/compel/plugins/std/string.h        | 6 +++---
 compel/plugins/include/uapi/compel/plugins/std/syscall-types.h | 6 +++---
 7 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/compel/include/uapi/compel/plugins.h b/compel/include/uapi/compel/plugins.h
index e9ebfb67f7c7..526e5348062a 100644
--- a/compel/include/uapi/compel/plugins.h
+++ b/compel/include/uapi/compel/plugins.h
@@ -1,5 +1,5 @@
-#ifndef UAPI_COMPEL_PLUGIN_H__
-#define UAPI_COMPEL_PLUGIN_H__
+#ifndef UAPI_COMPEL_PLUGINS_H__
+#define UAPI_COMPEL_PLUGINS_H__
 
 #define __init	__attribute__((__used__)) __attribute__ ((__section__(".compel.init")))
 #define __exit	__attribute__((__used__)) __attribute__ ((__section__(".compel.exit")))
@@ -32,4 +32,4 @@ typedef struct {
 
 #endif /* __ASSEMBLY__ */
 
-#endif /* UAPI_COMPEL_PLUGIN_H__ */
+#endif /* UAPI_COMPEL_PLUGINS_H__ */
diff --git a/compel/plugins/include/std-priv.h b/compel/plugins/include/std-priv.h
index 3fc3041c036f..7c0cc0012ca0 100644
--- a/compel/plugins/include/std-priv.h
+++ b/compel/plugins/include/std-priv.h
@@ -1,6 +1,6 @@
-#ifndef __COMPEL_PLUGIN_STD_PRIV_H__
-#define __COMPEL_PLUGIN_STD_PRIV_H__
+#ifndef COMPEL_PLUGIN_STD_PRIV_H__
+#define COMPEL_PLUGIN_STD_PRIV_H__
 
 extern int std_ctl_sock(void);
 
-#endif /* __COMPEL_PLUGIN_STD_PRIV_H__ */
+#endif /* COMPEL_PLUGIN_STD_PRIV_H__ */
diff --git a/compel/plugins/include/uapi/compel/plugins/plugin-fds.h b/compel/plugins/include/uapi/compel/plugins/plugin-fds.h
index 96991eaa4cec..ae83caa87ad1 100644
--- a/compel/plugins/include/uapi/compel/plugins/plugin-fds.h
+++ b/compel/plugins/include/uapi/compel/plugins/plugin-fds.h
@@ -1,9 +1,8 @@
 /*
  * plugin-fds.h -- API for fds compel plugin
  */
-
-#ifndef __COMPEL_PLUGIN_FDS_H__
-#define __COMPEL_PLUGIN_FDS_H__
+#ifndef UAPI_COMPEL_PLUGIN_FDS_H__
+#define UAPI_COMPEL_PLUGIN_FDS_H__
 
 extern int fds_send(int *fds, int nr_fds);
 extern int fds_recv(int *fds, int nr_fds);
@@ -24,4 +23,4 @@ static inline int fds_recv_one(void)
 	return fd;
 }
 
-#endif /* __COMPEL_PLUGIN_FDS_H__ */
+#endif /* UAPI_COMPEL_PLUGIN_FDS_H__ */
diff --git a/compel/plugins/include/uapi/compel/plugins/plugin-shmem.h b/compel/plugins/include/uapi/compel/plugins/plugin-shmem.h
index 7e5850953a6b..6e5e16163c2d 100644
--- a/compel/plugins/include/uapi/compel/plugins/plugin-shmem.h
+++ b/compel/plugins/include/uapi/compel/plugins/plugin-shmem.h
@@ -1,5 +1,5 @@
-#ifndef __COMPEL_PLUGIN_SHMEM_H__
-#define __COMPEL_PLUGIN_SHMEM_H__
+#ifndef UAPI_COMPEL_PLUGIN_SHMEM_H__
+#define UAPI_COMPEL_PLUGIN_SHMEM_H__
 
 /*
  * Creates local shmem mapping and announces it
@@ -14,4 +14,4 @@ extern void *shmem_create(unsigned long size);
  */
 extern void *shmem_receive(unsigned long *size);
 
-#endif /* __COMPEL_PLUGIN_SHMEM_H__ */
+#endif /* UAPI_COMPEL_PLUGIN_SHMEM_H__ */
diff --git a/compel/plugins/include/uapi/compel/plugins/plugin-std.h b/compel/plugins/include/uapi/compel/plugins/plugin-std.h
index 97a13388ab59..4a4d1420d058 100644
--- a/compel/plugins/include/uapi/compel/plugins/plugin-std.h
+++ b/compel/plugins/include/uapi/compel/plugins/plugin-std.h
@@ -1,7 +1,7 @@
-#ifndef COMPEL_PLUGIN_STD_STD_H__
-#define COMPEL_PLUGIN_STD_STD_H__
+#ifndef UAPI_COMPEL_PLUGIN_STD_H__
+#define UAPI_COMPEL_PLUGIN_STD_H__
 
 #include <compel/plugins.h>
 #include <compel/plugins/std/syscall.h>
 
-#endif /* COMPEL_PLUGIN_STD_STD_H__ */
+#endif /* UAPI_COMPEL_PLUGIN_STD_H__ */
diff --git a/compel/plugins/include/uapi/compel/plugins/std/string.h b/compel/plugins/include/uapi/compel/plugins/std/string.h
index 8aec886bd093..59082a426be1 100644
--- a/compel/plugins/include/uapi/compel/plugins/std/string.h
+++ b/compel/plugins/include/uapi/compel/plugins/std/string.h
@@ -1,5 +1,5 @@
-#ifndef COMPEL_PLUGIN_STD_STRING_H__
-#define COMPEL_PLUGIN_STD_STRING_H__
+#ifndef UAPI_COMPEL_PLUGIN_STD_STRING_H__
+#define UAPI_COMPEL_PLUGIN_STD_STRING_H__
 
 #include <sys/types.h>
 #include <stdbool.h>
@@ -25,4 +25,4 @@ extern void *std_memcpy(void *to, const void *from, unsigned int n);
 extern int std_memcmp(const void *cs, const void *ct, size_t count);
 extern int std_strcmp(const char *cs, const char *ct);
 
-#endif /* COMPEL_PLUGIN_STD_STRING_H__ */
+#endif /* UAPI_COMPEL_PLUGIN_STD_STRING_H__ */
diff --git a/compel/plugins/include/uapi/compel/plugins/std/syscall-types.h b/compel/plugins/include/uapi/compel/plugins/std/syscall-types.h
index 4a907765b8be..883b54011a86 100644
--- a/compel/plugins/include/uapi/compel/plugins/std/syscall-types.h
+++ b/compel/plugins/include/uapi/compel/plugins/std/syscall-types.h
@@ -3,8 +3,8 @@
  * syscall prototypes need them.
  */
 
-#ifndef COMPEL_SYSCALL_TYPES_H__
-#define COMPEL_SYSCALL_TYPES_H__
+#ifndef UAPI_COMPEL_SYSCALL_TYPES_H__
+#define UAPI_COMPEL_SYSCALL_TYPES_H__
 
 #include <arpa/inet.h>
 #include <sys/time.h>
@@ -54,4 +54,4 @@ typedef int kernel_timer_t;
 
 #include <compel/plugins/std/asm/syscall-types.h>
 
-#endif /* COMPEL_SYSCALL_TYPES_H__ */
+#endif /* UAPI_COMPEL_SYSCALL_TYPES_H__ */
-- 
2.7.4