projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge upstream, address conflict in src/utils/cmds/cmds_test.c
[collectd.git]
/
src
/
vserver.c
diff --git
a/src/vserver.c
b/src/vserver.c
index
f15bb3b
..
e1d1b35
100644
(file)
--- a/
src/vserver.c
+++ b/
src/vserver.c
@@
-28,8
+28,8
@@
#include "collectd.h"
#include "collectd.h"
-#include "common.h"
#include "plugin.h"
#include "plugin.h"
+#include "utils/common/common.h"
#include <dirent.h>
#include <sys/types.h>
#include <dirent.h>
#include <sys/types.h>
@@
-42,7
+42,7
@@
#error "No applicable input method."
#endif
#error "No applicable input method."
#endif
-static int pagesize
= 0
;
+static int pagesize;
static int vserver_init(void) {
/* XXX Should we check for getpagesize () in configure?
static int vserver_init(void) {
/* XXX Should we check for getpagesize () in configure?