X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Flib%2Fsyscall.c;h=a892b2ddbe3a011dc36d37a3573fa374511a86f4;hb=02d358546ec9b7c6e38cf415b9581e6523411d61;hp=ba995bad5c99c8eb7cccafe53f6fdf30b4cbc46a;hpb=78268471d156ec124e91d530a86513cbff7e1ff1;p=util-vserver.git diff --git a/util-vserver/lib/syscall.c b/util-vserver/lib/syscall.c index ba995ba..a892b2d 100644 --- a/util-vserver/lib/syscall.c +++ b/util-vserver/lib/syscall.c @@ -19,15 +19,18 @@ #ifdef HAVE_CONFIG_H # include #endif -#include "compat.h" #include "compat.h" #include "vserver.h" -#include "vserver-internal.h" #include "internal.h" #define _LINUX_TYPES_H 1 -#include "linuxvirtual.h" +#include "virtual.h" + +#if defined(VC_ENABLE_API_COMPAT) && defined(VC_ENABLE_API_LEGACY) +# define VC_MULTIVERSION_SYSCALL 1 +#endif +#include "vserver-internal.h" #ifdef VC_ENABLE_API_COMPAT # include "syscall-compat.hc" @@ -40,10 +43,11 @@ #include #include + #if defined(VC_ENABLE_API_COMPAT) || defined(VC_ENABLE_API_LEGACY) -int -vc_new_s_context(ctx_t ctx, unsigned int remove_cap, unsigned int flags) +xid_t +vc_new_s_context(xid_t ctx, unsigned int remove_cap, unsigned int flags) { CALL_VC(CALL_VC_COMPAT(vc_new_s_context, ctx, remove_cap, flags), CALL_VC_LEGACY(vc_new_s_context, ctx, remove_cap, flags)); @@ -56,11 +60,5 @@ vc_set_ipv4root(uint32_t bcast, size_t nb, struct vc_ip_mask_pair const *ips) CALL_VC_LEGACY(vc_set_ipv4root, bcast, nb, ips)); } -int -vc_chrootsafe(char const *dir) -{ - CALL_VC(CALL_VC_COMPAT(vc_chrootsafe, dir), - CALL_VC_LEGACY(vc_chrootsafe, dir)); -} - +LINK_WARNING("vc_new_s_context", "warning: vc_new_s_context() is obsoleted; use vc_create_context() instead of"); #endif