X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fusers.c;h=30e0dbe67020817ed0d4b2630eb0341f99cdd5be;hb=f77a55966249c8c185b5e3b11000dccacfd91beb;hp=40ffece1fef537342338bc26ccf467cdeba7dac0;hpb=2421812ea47269c50920414a6e3c32448800120f;p=collectd.git diff --git a/src/users.c b/src/users.c index 40ffece1..30e0dbe6 100644 --- a/src/users.c +++ b/src/users.c @@ -3,7 +3,7 @@ * Copyright (C) 2005-2007 Sebastian Harl * Copyright (C) 2005 Niki W. Waibel * Copyright (C) 2005-2007 Florian octo Forster - * Copyright (C) 2008 Oleg King + * 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 @@ -26,6 +26,7 @@ **/ #include "collectd.h" + #include "common.h" #include "plugin.h" @@ -40,9 +41,6 @@ #elif HAVE_UTMP_H # include /* #endif HAVE_UTMP_H */ - -#else -# error "No applicable input method." #endif static void users_submit (gauge_t value) @@ -80,7 +78,7 @@ static int users_read (void) users_submit (users); /* #endif HAVE_GETUTXENT */ - + #elif HAVE_GETUTENT unsigned int users = 0; struct utmp *entry = NULL; @@ -102,17 +100,17 @@ static int users_read (void) #elif HAVE_LIBSTATGRAB sg_user_stats *us; -# if HAVE_LIBSTATGRAB_GET_USER_STATS_ARG +# 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); + return (-1); users_submit ((gauge_t) -# if HAVE_LIBSTATGRAB_GET_USER_STATS_ARG +# if HAVE_LIBSTATGRAB_0_90 num_entries); # else us->num_entries);