From 641e79c3c103586d1a97ace4ea1fe865a15bb3a2 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Thu, 29 Jan 2004 11:00:41 +0000 Subject: [PATCH] merged with 0.28 git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@720 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/lib/ext2fs.h | 6 +++--- util-vserver/lib/getversion.c | 4 ++-- util-vserver/lib/vserver.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/util-vserver/lib/ext2fs.h b/util-vserver/lib/ext2fs.h index 6213185..1102310 100644 --- a/util-vserver/lib/ext2fs.h +++ b/util-vserver/lib/ext2fs.h @@ -19,9 +19,9 @@ #ifndef H_UTIL_VSERVER_SRC_EXT2FS_H #define H_UTIL_VSERVER_SRC_EXT2FS_H -#ifdef HAVE_EXT2FS_EXT2FS_H -# include -#elif defined(HAVE_LINUX_EXT2_FS_H) +#ifdef ENSC_HAVE_EXT2FS_EXT2_FS_H +# include +#elif defined(ENSC_HAVE_LINUX_EXT2_FS_H) # include #else # error Do not know how to include diff --git a/util-vserver/lib/getversion.c b/util-vserver/lib/getversion.c index a010157..4234d83 100644 --- a/util-vserver/lib/getversion.c +++ b/util-vserver/lib/getversion.c @@ -24,7 +24,7 @@ #include "getversion-internal.hc" int -vc_get_version(int cat) +vc_get_version() { - return vc_get_version_internal(cat); + return vc_get_version_internal(VC_CAT_COMPAT); } diff --git a/util-vserver/lib/vserver.h b/util-vserver/lib/vserver.h index 6938f45..6af871a 100644 --- a/util-vserver/lib/vserver.h +++ b/util-vserver/lib/vserver.h @@ -118,8 +118,8 @@ extern "C" { uint32_t mask; }; - /** Returns version of the given API-category */ - int vc_get_version(int category); + /** Returns the version of the current kernel API. */ + int vc_get_version(); /** Puts current process into context , removes the given caps and * sets flags. -- 1.8.1.5