[CRIU] [PATCH 1/7] compel: plugins, std -- Use compel_plugin entry point routine name

Cyrill Gorcunov gorcunov at openvz.org
Mon Sep 26 12:36:33 PDT 2016


Plain "main" makes compilers unhappy since it's
known predefined name.

Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 compel/plugins/std/std.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compel/plugins/std/std.c b/compel/plugins/std/std.c
index 6894a6921336..ada3f09d21a3 100644
--- a/compel/plugins/std/std.c
+++ b/compel/plugins/std/std.c
@@ -6,7 +6,7 @@
 
 #include "asm/prologue.h"
 
-extern int main(void *arg_p, unsigned int arg_s);
+extern int compel_main(void *arg_p, unsigned int arg_s);
 
 static struct prologue_init_args *init_args;
 static int ctl_socket = -1;
@@ -75,7 +75,7 @@ int __export_std_compel_start(struct prologue_init_args *args,
 	}
 
 	if (!ret)
-		ret = main(args->arg_p, args->arg_s);
+		ret = compel_main(args->arg_p, args->arg_s);
 
 	for (; i > 0; i--) {
 		const plugin_init_t *d = init_array[i - 1];
-- 
2.7.4



More information about the CRIU mailing list