--- a/globals.c Tue Dec 11 21:42:38 2018 +0000
+++ b/globals.c Tue Dec 11 22:24:49 2018 +0000
@@ -44,7 +44,7 @@
char *g_interface_list[MAX_NR_INTERFACES];
size_t g_interface_list_length = 0;
-#ifdef __linux
+#ifdef __linux__
char *g_wireless_list[MAX_NR_INTERFACES];
size_t g_wireless_list_length = 0;
#endif
--- a/linux.c Tue Dec 11 21:42:38 2018 +0000
+++ b/linux.c Tue Dec 11 22:24:49 2018 +0000
@@ -13,7 +13,7 @@
*
* See COPYING for GPL licensing information.
*/
-#ifdef __linux
+#ifdef __linux__
#include <sys/sysinfo.h>
#include <sys/socket.h>
@@ -260,7 +260,7 @@
}
}
-#endif /* __linux */
+#endif /* __linux__ */
/* vim: ts=4 sts=4 sw=4 nowrap
*/
--- a/mib.c Tue Dec 11 21:42:38 2018 +0000
+++ b/mib.c Tue Dec 11 22:24:49 2018 +0000
@@ -44,7 +44,7 @@
static const oid_t m_if_1_oid = { { 1, 3, 6, 1, 2, 1, 2 }, 7, 8 };
static const oid_t m_if_2_oid = { { 1, 3, 6, 1, 2, 1, 2, 2, 1 }, 9, 10 };
static const oid_t m_host_oid = { { 1, 3, 6, 1, 2, 1, 25, 1 }, 8, 9 };
-#ifdef __linux
+#ifdef __linux__
static const oid_t m_wireless_oid = { { 1, 3, 6, 1, 4, 1, 762, 2, 5, 2, 1 }, 11,13 };
#endif
static const oid_t m_memory_oid = { { 1, 3, 6, 1, 4, 1, 2021, 4, }, 8, 10 };
@@ -633,7 +633,7 @@
if (!mib_alloc_entry(&m_host_oid, 1, 0, BER_TYPE_TIME_TICKS))
return -1;
-#ifdef __linux
+#ifdef __linux__
if (g_wireless_list_length > 0) {
for (i = 0; i < g_wireless_list_length; i++) {
if (mib_build_entry(&m_wireless_oid, 1, i + 1, BER_TYPE_INTEGER, (const void *)(i + 1)) == -1)
@@ -743,7 +743,7 @@
meminfo_t meminfo;
cpuinfo_t cpuinfo;
netinfo_t netinfo;
-#ifdef __linux
+#ifdef __linux__
wirelessinfo_t wirelessinfo;
#endif
#ifdef CONFIG_ENABLE_DEMO
@@ -827,7 +827,7 @@
if (mib_update_entry(&m_host_oid, 1, 0, &pos, BER_TYPE_TIME_TICKS, (const void *)(uintptr_t)get_system_uptime()) == -1)
return -1;
-#ifdef __linux
+#ifdef __linux__
if (full) {
if (g_wireless_list_length > 0) {
get_wirelessinfo(&u.wirelessinfo);
--- a/mini_snmpd.c Tue Dec 11 21:42:38 2018 +0000
+++ b/mini_snmpd.c Tue Dec 11 22:24:49 2018 +0000
@@ -56,7 +56,7 @@
" -C, --contact STR System contact, default: none\n"
" -d, --disks PATH Disks to monitor, default: /\n"
" -i, --interfaces IFACE Network interfaces to monitor, default: none\n"
-#ifdef __linux
+#ifdef __linux__
" -w, --wireless-interfaces IFACE Wireless network interfaces to monitor, default: none\n"
#endif
" -I, --listen IFACE Network interface to listen, default: all\n"
@@ -318,7 +318,7 @@
{ "contact", 1, 0, 'C' },
{ "disks", 1, 0, 'd' },
{ "interfaces", 1, 0, 'i' },
-#ifdef __linux
+#ifdef __linux__
{ "wireless-interfaces", 1, 0, 'w' },
#endif
#ifndef __FreeBSD__
@@ -420,7 +420,7 @@
case 'i':
g_interface_list_length = split(optarg, ",;", g_interface_list, MAX_NR_INTERFACES);
break;
-#ifdef __linux
+#ifdef __linux__
case 'w':
g_wireless_list_length = split(optarg, ",;", g_wireless_list, MAX_NR_INTERFACES);
break;
--- a/mini_snmpd.h Tue Dec 11 21:42:38 2018 +0000
+++ b/mini_snmpd.h Tue Dec 11 22:24:49 2018 +0000
@@ -238,7 +238,7 @@
char mac_addr[MAX_NR_INTERFACES][6];
} netinfo_t;
-#ifdef __linux
+#ifdef __linux__
typedef struct wirelessinfo_s {
unsigned int signal[MAX_NR_INTERFACES];
unsigned int noise[MAX_NR_INTERFACES];
@@ -282,7 +282,7 @@
extern char *g_interface_list[MAX_NR_INTERFACES];
extern size_t g_interface_list_length;
-#ifdef __linux
+#ifdef __linux__
extern char *g_wireless_list[MAX_NR_INTERFACES];
extern size_t g_wireless_list_length;
#endif
@@ -337,7 +337,7 @@
void get_cpuinfo (cpuinfo_t *cpuinfo);
void get_diskinfo (diskinfo_t *diskinfo);
void get_netinfo (netinfo_t *netinfo);
-#ifdef __linux
+#ifdef __linux__
void get_wirelessinfo (wirelessinfo_t *wirelessinfo);
#endif
#ifdef CONFIG_ENABLE_DEMO