X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fusers.c;h=30e0dbe67020817ed0d4b2630eb0341f99cdd5be;hb=da612fa9c6a3343b43789569d64197d7c690be52;hp=ca05f50d9da8ba33460237ede1edd8d65313c85b;hpb=10e6e69a60f1722bb0a8a3b25bd5812471f33cfc;p=collectd.git diff --git a/src/users.c b/src/users.c index ca05f50d..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 @@ -21,11 +21,12 @@ * Authors: * Sebastian Harl * Niki W. Waibel - * Florian octo Forster + * Florian octo Forster * Oleg King **/ #include "collectd.h" + #include "common.h" #include "plugin.h" @@ -77,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; @@ -99,11 +100,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