summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoît Dejean <benoit@placenet.org>2007-05-08 17:09:48 +0000
committerBenoît Dejean <bdejean@src.gnome.org>2007-05-08 17:09:48 +0000
commit8308952bdfa5f091522a6cd0ce73259b8f79484a (patch)
treed9339b6e5b0cf409ace6b7ffc2f5c78a8130775e
parent3bf5087ae8a90187add3cb5f9a3eee3a3bcc7818 (diff)
downloadlibgtop-8308952bdfa5f091522a6cd0ce73259b8f79484a.tar.gz
Fixed build on OpenBSD. Patch by Jasper Lievisse Adriaanse
2007-05-08 Benoît Dejean <benoit@placenet.org> * fsusage.c: (_glibtop_bsd_get_fsusage_read_write): * netload.c: (glibtop_get_netload_p): Fixed build on OpenBSD. Patch by Jasper Lievisse Adriaanse <jasper@nedbsd.nl>. svn path=/branches/gnome-2-14/; revision=2575
-rw-r--r--sysdeps/bsd/ChangeLog8
-rw-r--r--sysdeps/bsd/fsusage.c2
-rw-r--r--sysdeps/bsd/netload.c4
3 files changed, 14 insertions, 0 deletions
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 <benoit@placenet.org>
+
+ * fsusage.c: (_glibtop_bsd_get_fsusage_read_write):
+ * netload.c: (glibtop_get_netload_p):
+
+ Fixed build on OpenBSD.
+ Patch by Jasper Lievisse Adriaanse <jasper@nedbsd.nl>.
+
2007-02-18 Benoît Dejean <benoit@placenet.org>
* 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;
}