freebsd-ports/devel/libgtop2/files/patch-sysdeps::freebsd::proctime.c
Joe Marcus Clarke c4851e78e4 Presenting GNOME 2.6.0. The FreeBSD GNOME Team feels this our best release
ever.  It fixes many bugs, and adds some features missing in previous
FreeBSD ports.  To help users upgrade from GNOME 2.4, we have constructed an
upgrade FAQ at:

http://www.freebsd.org/gnome/docs/faq26.html

Please read it carefully.  GNOME 2.6 packages are also available for all
supported i386 versions of FreeBSD at:

http://www.marcuscom.com/tinderbox/

The FreeBSD GNOME Team would like the thank the following users for their
wonderful testing and patching efforts.  We would especially like to thank
Franz Klammer <klammer@webonaut.com> for his wonderful new splash screen.
Without these people, our team, and our team alumni, GNOME on FreeBSD would
not be possible.

Jeremy Messenger <mezz7@cox.net>
Khairil Yusof <kaeru@pd.jaring.my>
Koop Mast <kwm@rainbow-runner.nl>
Simon Barner <barner@in.tum.de>
Tom McLaughlin <tmclaugh@sdf.lonestar.org>
Scott Dodson <sdodson@sdodson.com>
Vladimir Grebenschikov <vova@sw.ru>
2004-04-05 03:11:39 +00:00

48 lines
962 B
C

--- sysdeps/freebsd/proctime.c.orig Wed Mar 10 21:23:52 2004
+++ sysdeps/freebsd/proctime.c Thu Mar 11 15:47:35 2004
@@ -59,6 +59,7 @@
#ifndef __FreeBSD__
+#ifndef __FreeBSD__
static void
calcru(p, up, sp, ip)
struct proc *p;
@@ -81,19 +82,10 @@
tot = 1;
}
-#if (defined __FreeBSD__) && (__FreeBSD_version >= 300003)
-
- /* This was changed from a `struct timeval' into a `guint64'
- * on FreeBSD 3.0 and renamed p_rtime -> p_runtime.
- */
-
- totusec = (u_quad_t) p->p_runtime;
-#else
sec = p->p_rtime.tv_sec;
usec = p->p_rtime.tv_usec;
totusec = (quad_t)sec * 1000000 + usec;
-#endif
if (totusec < 0) {
/* XXX no %qd in kernel. Truncate. */
@@ -116,6 +108,7 @@
ip->tv_usec = it % 1000000;
}
}
+#endif
#endif /* !__FreeBSD__ */
@@ -133,9 +126,6 @@
#endif
struct pstats pstats;
int count;
-
- char filename [BUFSIZ];
- struct stat statb;
glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_TIME), 0);