1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
From: Debian Xfce Maintainers <debian-xfce@lists.debian.org>
Date: Sat, 8 Dec 2018 17:06:10 +0100
Subject: Fix build on Debian/kFreeBSD by reusing the FreeBSD #defines
---
panel-plugin/net.c | 4 ++--
panel-plugin/net.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/panel-plugin/net.c b/panel-plugin/net.c
index c66d144..e075db1 100644
--- 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__
diff --git a/panel-plugin/net.h b/panel-plugin/net.h
index a268088..8e7d4d7 100644
--- a/panel-plugin/net.h
+++ b/panel-plugin/net.h
@@ -69,7 +69,7 @@ typedef struct
#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 @@ typedef struct
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;
|
