git://git.onelab.eu
/
util-vserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge with 0.30.213
[util-vserver.git]
/
lib
/
vserver-internal.h
diff --git
a/lib/vserver-internal.h
b/lib/vserver-internal.h
index
872f5a6
..
5c13bc5
100644
(file)
--- a/
lib/vserver-internal.h
+++ b/
lib/vserver-internal.h
@@
-1,4
+1,4
@@
-// $Id: vserver-internal.h 24
15 2006-12-08 13:24:49
Z dhozac $ --*- c++ -*--
+// $Id: vserver-internal.h 24
46 2007-01-09 13:22:11
Z dhozac $ --*- c++ -*--
// Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
//
// Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
//
@@
-50,7
+50,7
@@
inline static ALWAYSINLINE void vc_noop0() {}
# define CALL_VC(...) \
do { \
int ver = utilvserver_checkCompatVersion(); \
# define CALL_VC(...) \
do { \
int ver = utilvserver_checkCompatVersion(); \
-
int UNUSED conf = utilvserver_checkCompatConfig();
\
+
uint_least32_t conf = utilvserver_checkCompatConfig();
\
if (ver==-1) return -1; \
VC_SUFFIX, __VA_ARGS__, VC_PREFIX; \
errno = ENOSYS; \
if (ver==-1) return -1; \
VC_SUFFIX, __VA_ARGS__, VC_PREFIX; \
errno = ENOSYS; \
@@
-253,10
+253,6
@@
inline static ALWAYSINLINE void vc_noop0() {}
inline static UNUSED ALWAYSINLINE
int vserver(uint32_t cmd, uint32_t id, void *data)
{
inline static UNUSED ALWAYSINLINE
int vserver(uint32_t cmd, uint32_t id, void *data)
{
-#if defined __dietlibc__
- extern long int syscall (long int __sysno, ...);
-#endif
-
return syscall(__NR_vserver, cmd, id, data);
}
#else
return syscall(__NR_vserver, cmd, id, data);
}
#else