[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Bug#815449: xfce4-netload-plugin: kfreebsd detection does not work



tags 815449 + patch
user debian-bsd@lists.debian.org
usertags 815449 + kfreebsd
thanks

Hi,

Andreas Beckmann wrote:
> net.h:72:57: error: operator '||' has no right operand
>  #elif __FreeBSD__ || __DragonFly__ || __FreeBSD_kernel__
> 
> If that problem is not trivially fixable, please request decrufting
> of the outdated binary packages.

It is trivially fixable mistake made in a few places.
Please find patch attached.  Thank you!

Regards,
-- 
Steven Chamberlain
steven@pyro.eu.org
--- a/panel-plugin/net.h
+++ b/panel-plugin/net.h
@@ -69,7 +69,7 @@
 #ifdef __HPUX__
     int             wait_pcks_counter;
     nmapi_logstat*  if_ptr;
-#elif __FreeBSD__ || __DragonFly__ || __FreeBSD_kernel__
+#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
     int             watchif;
     int             dev_opened;
 #elif __NetBSD__
@@ -79,7 +79,7 @@
     char*           buf2;
     int             alloc1;
     int             alloc2;
-#elif __OpenBSD__ || __MicroBSD__ || __APPLE__
+#elif defined(__OpenBSD__) || defined(__MicroBSD__) || defined(__APPLE__)
     int             mib_name1[6];
     int             mib_name2[6];
     char*           buf1;
--- a/panel-plugin/net.c
+++ b/panel-plugin/net.c
@@ -50,13 +50,13 @@
 #elif __APPLE__
 # include "src/macos.h"
 # include "src/macos.c"
-#elif __FreeBSD__ || __DragonFly__ || __FreeBSD_kernel__
+#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
 # include "wormulon/freebsd.h"
 # include "wormulon/freebsd.c"
 #elif __linux__
 # include "wormulon/linux.h"
 # include "wormulon/linux.c"
-#elif __OpenBSD__ || __MicroBSD__
+#elif defined(__OpenBSD__) || defined(__MicroBSD__)
 # include "wormulon/openbsd.h"
 # include "wormulon/openbsd.c"
 #elif __NetBSD__

Attachment: signature.asc
Description: Digital signature


Reply to: