From 8308952bdfa5f091522a6cd0ce73259b8f79484a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Dejean?= Date: Tue, 8 May 2007 17:09:48 +0000 Subject: [PATCH] Fixed build on OpenBSD. Patch by Jasper Lievisse Adriaanse MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2007-05-08 Benoît Dejean * fsusage.c: (_glibtop_bsd_get_fsusage_read_write): * netload.c: (glibtop_get_netload_p): Fixed build on OpenBSD. Patch by Jasper Lievisse Adriaanse . svn path=/branches/gnome-2-14/; revision=2575 --- sysdeps/bsd/ChangeLog | 8 ++++++++ sysdeps/bsd/fsusage.c | 2 ++ sysdeps/bsd/netload.c | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/sysdeps/bsd/ChangeLog b/sysdeps/bsd/ChangeLog index 9b92d189..abac6dbe 100644 --- a/sysdeps/bsd/ChangeLog +++ b/sysdeps/bsd/ChangeLog @@ -1,3 +1,11 @@ +2007-05-08 Benoît Dejean + + * fsusage.c: (_glibtop_bsd_get_fsusage_read_write): + * netload.c: (glibtop_get_netload_p): + + Fixed build on OpenBSD. + Patch by Jasper Lievisse Adriaanse . + 2007-02-18 Benoît Dejean * AUTHORS: diff --git a/sysdeps/bsd/fsusage.c b/sysdeps/bsd/fsusage.c index 5f592b5d..db337153 100644 --- a/sysdeps/bsd/fsusage.c +++ b/sysdeps/bsd/fsusage.c @@ -54,7 +54,9 @@ _glibtop_bsd_get_fsusage_read_write(glibtop *server, return; } +#if !defined(__OpenBSD__) buf->read = sfs.f_syncreads + sfs.f_asyncreads; +#endif buf->write = sfs.f_syncwrites + sfs.f_asyncwrites; buf->flags |= (1 << GLIBTOP_FSUSAGE_READ) | (1 << GLIBTOP_FSUSAGE_WRITE); } diff --git a/sysdeps/bsd/netload.c b/sysdeps/bsd/netload.c index 6dd1a6d6..a16bdd0b 100644 --- a/sysdeps/bsd/netload.c +++ b/sysdeps/bsd/netload.c @@ -233,7 +233,11 @@ glibtop_get_netload_p (glibtop *server, glibtop_netload *buf, buf->flags |= GLIBTOP_NETLOAD_ADDRESS6; } /* FIXME prefix6, scope6 */ +#if defined (__OpenBSD__) + ifaddraddr = (u_long) ifaddr.ifa.ifa_list.tqe_next; +#else ifaddraddr = (u_long) ifaddr.ifa.ifa_link.tqe_next; +#endif } return; }