From ff160fa9f3992b744b07511819790f6b3964a43c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Dejean?= <bdejean@src.gnome.org>
Date: Sun, 22 Aug 2004 19:29:05 +0000
Subject: [PATCH] Merged Marcus' patches.

	* procstate.c:
	* uptime.c: (glibtop_get_uptime_p): Merged Marcus' patches.
---
 sysdeps/freebsd/ChangeLog   | 5 +++++
 sysdeps/freebsd/procstate.c | 2 +-
 sysdeps/freebsd/uptime.c    | 2 --
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sysdeps/freebsd/ChangeLog b/sysdeps/freebsd/ChangeLog
index fa51c6e1..7946d26e 100644
--- 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
diff --git a/sysdeps/freebsd/procstate.c b/sysdeps/freebsd/procstate.c
index c75c22df..71e09271 100644
--- 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
 
diff --git a/sysdeps/freebsd/uptime.c b/sysdeps/freebsd/uptime.c
index 83ef50a0..2db19951 100644
--- 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);