X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fusers.c;h=a4ee4ef7d1df2c2afc619b9ade1b0598a8a60ae9;hb=ab11d1b4db61f750f51be6e41dbe8320d3c65404;hp=b605ff84c9d7ab98cfb8abbd762b8d30207882fe;hpb=c57f2a191b63ce73fc432befebe9fa3af97c8eb5;p=collectd.git

diff --git a/src/users.c b/src/users.c
index b605ff84..a4ee4ef7 100644
--- a/src/users.c
+++ b/src/users.c
@@ -1,6 +1,9 @@
 /**
  * collectd - src/users.c
  * Copyright (C) 2005-2007  Sebastian Harl
+ * Copyright (C) 2005       Niki W. Waibel
+ * Copyright (C) 2005-2007  Florian octo Forster
+ * Copyright (C) 2008       Oleg King
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -17,6 +20,9 @@
  *
  * Authors:
  *   Sebastian Harl <sh at tokkee.org>
+ *   Niki W. Waibel <niki.waibel at newlogic.com>
+ *   Florian octo Forster <octo at collectd.org>
+ *   Oleg King <king2 at kaluga.ru>
  **/
 
 #include "collectd.h"
@@ -34,9 +40,6 @@
 #elif HAVE_UTMP_H
 # include <utmp.h>
 /* #endif HAVE_UTMP_H */
-
-#else
-# error "No applicable input method."
 #endif
 
 static void users_submit (gauge_t value)
@@ -74,7 +77,7 @@ static int users_read (void)
 
 	users_submit (users);
 /* #endif HAVE_GETUTXENT */
-	
+
 #elif HAVE_GETUTENT
 	unsigned int users = 0;
 	struct utmp *entry = NULL;
@@ -96,11 +99,21 @@ static int users_read (void)
 #elif HAVE_LIBSTATGRAB
 	sg_user_stats *us;
 
+# if HAVE_LIBSTATGRAB_0_90
+	size_t num_entries;
+	us = sg_get_user_stats (&num_entries);
+# else
 	us = sg_get_user_stats ();
+# endif
 	if (us == NULL)
-		return (-1);   
-
-	users_submit ((gauge_t) us->num_entries);
+		return (-1);
+
+	users_submit ((gauge_t)
+# if HAVE_LIBSTATGRAB_0_90
+		      num_entries);
+# else
+		      us->num_entries);
+# endif
 /* #endif HAVE_LIBSTATGRAB */
 
 #else