From 1ec99d96745796e036dcca709d842310c335da2b Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Thu, 5 Feb 2004 03:52:45 +0000 Subject: [PATCH] backported ENSC_SYSCALL_TRADITIONAL from HEAD version 0.28.1 git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/branches/SYSCALL_SWITCH@808 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/configure.ac | 3 ++- util-vserver/lib/syscall-legacy.hc | 4 ++-- util-vserver/lib/vserver-internal.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/util-vserver/configure.ac b/util-vserver/configure.ac index 94a49df..a82a738 100644 --- a/util-vserver/configure.ac +++ b/util-vserver/configure.ac @@ -25,7 +25,7 @@ dnl AC_PREREQ(2.57) -AC_INIT(util-vserver, 0.28, enrico.scholz@informatik.tu-chemnitz.de) +AC_INIT(util-vserver, 0.28.1, enrico.scholz@informatik.tu-chemnitz.de) AC_CONFIG_SRCDIR([src/capchroot.c]) AC_CONFIG_HEADER([config.h]) @@ -101,6 +101,7 @@ done IFS=$old_IFS AC_MSG_RESULT([$enable_apis]) +ENSC_SYSCALL ENSC_CHECK_EXT2FS_HEADER AC_CHECK_FUNCS([vserver]) AC_CHECK_DECLS(MS_MOVE,,,[#include ]) diff --git a/util-vserver/lib/syscall-legacy.hc b/util-vserver/lib/syscall-legacy.hc index 1513d7c..e82c7c6 100644 --- a/util-vserver/lib/syscall-legacy.hc +++ b/util-vserver/lib/syscall-legacy.hc @@ -50,7 +50,7 @@ static int __NR_set_ipv4root_rev2; static int __NR_set_ipv4root_rev3; static int rev_ipv4root=0; -#if (defined(__pic__) && defined(__i386)) || defined(__hppa__) +#ifdef ENSC_SYSCALL_TRADITIONAL inline static int set_ipv4root_rev0(unsigned long ip) { @@ -88,7 +88,7 @@ static int __NR_new_s_context_rev0; //static int __NR_new_s_context_rev1; static int rev_s_context=0; -#if defined(__pic__) && defined(__i386) +#ifdef ENSC_SYSCALL_TRADITIONAL inline static int new_s_context_rev0(int newctx, int remove_cap, int flags) { diff --git a/util-vserver/lib/vserver-internal.h b/util-vserver/lib/vserver-internal.h index eac71bd..94e505e 100644 --- a/util-vserver/lib/vserver-internal.h +++ b/util-vserver/lib/vserver-internal.h @@ -88,7 +88,7 @@ extern "C" { #endif #ifndef HAVE_VSERVER -#if defined(__pic__) && defined(__i386) +#ifdef ENSC_SYSCALL_TRADITIONAL inline static UNUSED ALWAYSINLINE int vserver(uint32_t cmd, uint32_t id, void *data) { -- 1.8.1.5