From 47384090bc0e86ce964a9aea37553a4092a4d171 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Wed, 21 Jan 2004 18:53:22 +0000 Subject: [PATCH] cleanups; fixed/changed "vserver-internal.h" including git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@669 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/lib/checkversion.c | 2 +- util-vserver/lib/getversion-internal.hc | 2 -- util-vserver/lib/getversion.c | 2 +- util-vserver/lib/ioctl-getext2flags.hc | 1 - util-vserver/lib/ioctl-getfilecontext.hc | 1 - util-vserver/lib/ioctl-getxflg.hc | 1 - util-vserver/lib/ioctl-setext2flags.hc | 1 - util-vserver/lib/ioctl-setfilecontext.hc | 1 - util-vserver/lib/ioctl-setxflg.hc | 1 - util-vserver/lib/syscall-compat.hc | 2 -- util-vserver/lib/syscall.c | 7 ++++++- util-vserver/lib/syscall_getiattr-v13.hc | 1 - util-vserver/lib/syscall_setiattr-v13.hc | 1 - 13 files changed, 8 insertions(+), 15 deletions(-) diff --git a/util-vserver/lib/checkversion.c b/util-vserver/lib/checkversion.c index 0034dc9..4180b2f 100644 --- a/util-vserver/lib/checkversion.c +++ b/util-vserver/lib/checkversion.c @@ -19,9 +19,9 @@ #ifdef HAVE_CONFIG_H # include #endif -#include "compat.h" #include "vserver.h" +#include "vserver-internal.h" #include "getversion-internal.hc" int diff --git a/util-vserver/lib/getversion-internal.hc b/util-vserver/lib/getversion-internal.hc index 4706b0c..0e9c843 100644 --- a/util-vserver/lib/getversion-internal.hc +++ b/util-vserver/lib/getversion-internal.hc @@ -23,8 +23,6 @@ # include #endif -#include "vserver-internal.h" - #define _LINUX_TYPES_H 1 #include "linuxvirtual.h" diff --git a/util-vserver/lib/getversion.c b/util-vserver/lib/getversion.c index bbdb513..a010157 100644 --- a/util-vserver/lib/getversion.c +++ b/util-vserver/lib/getversion.c @@ -19,8 +19,8 @@ #ifdef HAVE_CONFIG_H # include #endif -#include "compat.h" +#include "vserver-internal.h" #include "getversion-internal.hc" int diff --git a/util-vserver/lib/ioctl-getext2flags.hc b/util-vserver/lib/ioctl-getext2flags.hc index 1e79f04..4d56f90 100644 --- a/util-vserver/lib/ioctl-getext2flags.hc +++ b/util-vserver/lib/ioctl-getext2flags.hc @@ -21,7 +21,6 @@ #endif #include "vserver.h" -#include "vserver-internal.h" #include "ext2fs.h" #include diff --git a/util-vserver/lib/ioctl-getfilecontext.hc b/util-vserver/lib/ioctl-getfilecontext.hc index 0adbfa4..6426466 100644 --- a/util-vserver/lib/ioctl-getfilecontext.hc +++ b/util-vserver/lib/ioctl-getfilecontext.hc @@ -21,7 +21,6 @@ #endif #include "vserver.h" -#include "vserver-internal.h" #include "ext2fs.h" #include diff --git a/util-vserver/lib/ioctl-getxflg.hc b/util-vserver/lib/ioctl-getxflg.hc index 3d50c6f..3ea109a 100644 --- a/util-vserver/lib/ioctl-getxflg.hc +++ b/util-vserver/lib/ioctl-getxflg.hc @@ -21,7 +21,6 @@ #endif #include "vserver.h" -#include "vserver-internal.h" #include "ext2fs.h" #include diff --git a/util-vserver/lib/ioctl-setext2flags.hc b/util-vserver/lib/ioctl-setext2flags.hc index cdbb88c..d5d7323 100644 --- a/util-vserver/lib/ioctl-setext2flags.hc +++ b/util-vserver/lib/ioctl-setext2flags.hc @@ -21,7 +21,6 @@ #endif #include "vserver.h" -#include "vserver-internal.h" #include "ext2fs.h" #include diff --git a/util-vserver/lib/ioctl-setfilecontext.hc b/util-vserver/lib/ioctl-setfilecontext.hc index 3e0476d..e846c12 100644 --- a/util-vserver/lib/ioctl-setfilecontext.hc +++ b/util-vserver/lib/ioctl-setfilecontext.hc @@ -21,7 +21,6 @@ #endif #include "vserver.h" -#include "vserver-internal.h" #include "ext2fs.h" #include diff --git a/util-vserver/lib/ioctl-setxflg.hc b/util-vserver/lib/ioctl-setxflg.hc index 6563136..7224d11 100644 --- a/util-vserver/lib/ioctl-setxflg.hc +++ b/util-vserver/lib/ioctl-setxflg.hc @@ -21,7 +21,6 @@ #endif #include "vserver.h" -#include "vserver-internal.h" #include "ext2fs.h" #include diff --git a/util-vserver/lib/syscall-compat.hc b/util-vserver/lib/syscall-compat.hc index fb07d4d..6279d0a 100644 --- a/util-vserver/lib/syscall-compat.hc +++ b/util-vserver/lib/syscall-compat.hc @@ -22,9 +22,7 @@ #include "compat.h" #include "safechroot-internal.hc" - #include "vserver.h" -#include "vserver-internal.h" #include diff --git a/util-vserver/lib/syscall.c b/util-vserver/lib/syscall.c index 52134c8..de3f92e 100644 --- a/util-vserver/lib/syscall.c +++ b/util-vserver/lib/syscall.c @@ -23,12 +23,16 @@ #include "compat.h" #include "vserver.h" -#include "vserver-internal.h" #include "internal.h" #define _LINUX_TYPES_H 1 #include "linuxvirtual.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" #endif @@ -40,6 +44,7 @@ #include #include + #if defined(VC_ENABLE_API_COMPAT) || defined(VC_ENABLE_API_LEGACY) int diff --git a/util-vserver/lib/syscall_getiattr-v13.hc b/util-vserver/lib/syscall_getiattr-v13.hc index efdeff3..3c514c4 100644 --- a/util-vserver/lib/syscall_getiattr-v13.hc +++ b/util-vserver/lib/syscall_getiattr-v13.hc @@ -21,7 +21,6 @@ #endif #include "vserver.h" -#include "vserver-internal.h" static inline ALWAYSINLINE int vc_get_iattr_v13(dev_t dev, ino_t ino, xid_t *xid, diff --git a/util-vserver/lib/syscall_setiattr-v13.hc b/util-vserver/lib/syscall_setiattr-v13.hc index 32768e7..7143040 100644 --- a/util-vserver/lib/syscall_setiattr-v13.hc +++ b/util-vserver/lib/syscall_setiattr-v13.hc @@ -21,7 +21,6 @@ #endif #include "vserver.h" -#include "vserver-internal.h" static inline ALWAYSINLINE int vc_set_iattr_v13(dev_t dev, ino_t ino, xid_t xid, uint32_t flags, uint32_t mask) -- 1.8.1.5