[Xfce4-commits] [panel-plugins/xfce4-systemload-plugin] 01/02: Allow build on DragonFlyBSD

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

s   k   u   n   n   y   k       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository panel-plugins/xfce4-systemload-plugin.

commit 70de97592c5ac73e770f85cdc9af0d43efba40cb
Author: Romain B <skunnyk at alteroot.org>
Date:   Thu Nov 9 21:26:51 2017 +0100

    Allow build on DragonFlyBSD
---
 panel-plugin/cpu.c     | 6 +-----
 panel-plugin/memswap.c | 2 +-
 panel-plugin/uptime.c  | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/panel-plugin/cpu.c b/panel-plugin/cpu.c
index 56aa9c5..4e5cfb3 100644
--- a/panel-plugin/cpu.c
+++ b/panel-plugin/cpu.c
@@ -97,15 +97,11 @@ gulong read_cpuload(void)
     return cpu_used;
 }
 
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
 
 #include <osreldate.h>
 #include <sys/types.h>
-#if __FreeBSD_version < 500101
-#include <sys/dkstat.h>
-#else
 #include <sys/resource.h>
-#endif
 #include <sys/sysctl.h>
 #include <devstat.h>
 #include <fcntl.h>
diff --git a/panel-plugin/memswap.c b/panel-plugin/memswap.c
index 9e218cb..0b66df1 100644
--- a/panel-plugin/memswap.c
+++ b/panel-plugin/memswap.c
@@ -128,7 +128,7 @@ gint read_memswap(gulong *mem, gulong *swap, gulong *MT, gulong *MU, gulong *ST,
     return 0;
 }
 
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
 /*
  * This is inspired by /usr/src/usr.bin/top/machine.c 
  *
diff --git a/panel-plugin/uptime.c b/panel-plugin/uptime.c
index 8badf56..66dd645 100644
--- a/panel-plugin/uptime.c
+++ b/panel-plugin/uptime.c
@@ -60,7 +60,7 @@ gulong read_uptime(void)
     return uptime;
 }
 
-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
 
 #ifdef __NetBSD__
 /*

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.