projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #3339 from jkohen/patch-1
[collectd.git]
/
src
/
users.c
diff --git
a/src/users.c
b/src/users.c
index
6bc7cc3
..
768d488
100644
(file)
--- a/
src/users.c
+++ b/
src/users.c
@@
-27,8
+27,8
@@
#include "collectd.h"
#include "collectd.h"
-#include "common.h"
#include "plugin.h"
#include "plugin.h"
+#include "utils/common/common.h"
#if HAVE_STATGRAB_H
#include <statgrab.h>
#if HAVE_STATGRAB_H
#include <statgrab.h>
@@
-71,7
+71,7
@@
static int users_read(void) {
endutxent();
users_submit(users);
endutxent();
users_submit(users);
-/* #endif HAVE_GETUTXENT */
+
/* #endif HAVE_GETUTXENT */
#elif HAVE_GETUTENT
unsigned int users = 0;
#elif HAVE_GETUTENT
unsigned int users = 0;
@@
-89,7
+89,7
@@
static int users_read(void) {
endutent();
users_submit(users);
endutent();
users_submit(users);
-/* #endif HAVE_GETUTENT */
+
/* #endif HAVE_GETUTENT */
#elif HAVE_LIBSTATGRAB
sg_user_stats *us;
#elif HAVE_LIBSTATGRAB
sg_user_stats *us;
@@
-109,7
+109,7
@@
static int users_read(void) {
#else
us->num_entries);
#endif
#else
us->num_entries);
#endif
-/* #endif HAVE_LIBSTATGRAB */
+
/* #endif HAVE_LIBSTATGRAB */
#else
#error "No applicable input method."
#else
#error "No applicable input method."