X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fusers.c;h=afe26e1e27fc27a3d155b135b56d3571290bcd46;hb=e4b274ed754af52196d3390b8ce101a7f94e318a;hp=7df06c2baa41fe382ab536a25b7e2468dabf8b12;hpb=a905d397250bdcc9ae780c32fe36120267c17d82;p=collectd.git

diff --git a/src/users.c b/src/users.c
index 7df06c2b..afe26e1e 100644
--- a/src/users.c
+++ b/src/users.c
@@ -25,21 +25,16 @@
 
 #if HAVE_UTMPX_H
 # include <utmpx.h>
-#else /* !HAVE_UTMPX_H */
-# if HAVE_UTMP_H
-#  include <utmp.h>
-# endif /* HAVE_UTMP_H */
-#endif /* HAVE_UTMPX_H */
+/* #endif HAVE_UTMPX_H */
 
-#define MODULE_NAME "users"
+#elif HAVE_UTMP_H
+# include <utmp.h>
+/* #endif HAVE_UTMP_H */
 
-#if HAVE_GETUTXENT || HAVE_GETUTENT
-# define USERS_HAVE_READ 1
 #else
-# define USERS_HAVE_READ 0
+# error "No applicable input method."
 #endif
 
-#if USERS_HAVE_READ
 static void users_submit (gauge_t value)
 {
 	value_t values[1];
@@ -92,15 +87,16 @@ static int users_read (void)
 	endutent();
 
 	users_submit (users);
-#endif /* HAVE_GETUTENT */
+/* #endif HAVE_GETUTENT */
+
+#else
+# error "No applicable input method."
+#endif
 
 	return (0);
 } /* int users_read */
-#endif /* USERS_HAVE_READ */
 
 void module_register (void)
 {
-#if USERS_HAVE_READ
 	plugin_register_read ("users", users_read);
-#endif
 } /* void module_register(void) */