Merged Marcus' patches.

* procstate.c: * uptime.c: (glibtop_get_uptime_p): Merged Marcus' patches.
2004-08-22 19:29:05 +00:00
parent 11f37815a3
commit ff160fa9f3
3 changed files with 6 additions and 3 deletions
--- a/sysdeps/freebsd/ChangeLog
+++ b/sysdeps/freebsd/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-22  Benoît Dejean  <tazforever@dlfp.org>
+
+	* procstate.c:
+	* uptime.c: (glibtop_get_uptime_p): Merged Marcus' patches.
+
 2004-07-15  Benoît Dejean  <tazforever@dlfp.org>

 	* procstate.c: (glibtop_get_proc_state_p): Fixed copy/paste error
--- a/sysdeps/freebsd/procstate.c
+++ b/sysdeps/freebsd/procstate.c
@@ -28,7 +28,7 @@
 #include <glibtop_suid.h>

 #if !defined(__OpenBSD__)
-//&& (!defined __bsdi__)
+/* && (!defined __bsdi__) */
 #include <sys/user.h>
 #endif

--- a/sysdeps/freebsd/uptime.c
+++ b/sysdeps/freebsd/uptime.c
@@ -68,8 +68,6 @@ glibtop_get_uptime_p (glibtop *server, glibtop_uptime *buf)
 		buf->flags = _glibtop_sysdeps_uptime;
 	}
 #else
-	buf->flags = _glibtop_sysdeps_uptime;
-
 	glibtop_cpu cpu;

 	glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_UPTIME), 0);