merge with 0.30.213

[util-vserver.git] / lib / syscall.c

diff --git a/lib/syscall.c b/lib/syscall.c
index cf14a5e..37beb79 100644 (file)
--- a/lib/syscall.c
+++ b/lib/syscall.c
@@ -1,4 +1,4 @@
-// $Id: syscall.c,v 1.1.4.6 2003/12/30 13:45:57 ensc Exp $    --*- c++ -*--
+// $Id: syscall.c 2448 2007-01-10 18:49:13Z dhozac $    --*- c++ -*--
 
 // Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 //  
@@ -19,11 +19,18 @@
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
-#include "compat.h"
 
+#include "compat.h"
 #include "vserver.h"
+#include "internal.h"
+
+#define _LINUX_TYPES_H 1
+#include "virtual.h"
+
+#if defined(VC_ENABLE_API_COMPAT) && defined(VC_ENABLE_API_LEGACY)
+#  define VC_MULTIVERSION_SYSCALL      1
+#endif
 #include "vserver-internal.h"
-#include "linuxvirtual.h"
 
 #ifdef VC_ENABLE_API_COMPAT    
 #  include "syscall-compat.hc"
@@ -36,9 +43,10 @@
 #include <stdbool.h>
 #include <errno.h>
 
+
 #if defined(VC_ENABLE_API_COMPAT) || defined(VC_ENABLE_API_LEGACY)
 
-int
+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),
@@ -52,4 +60,7 @@ 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));
 }
 
+LINK_WARNING("vc_new_s_context", "warning: vc_new_s_context() is obsoleted; use vc_ctx_create() instead of");
+LINK_WARNING("vc_set_ipv4root",  "warning: vc_set_ipv4root() is obsoleted; use vc_net_create() instead of");
+
 #endif