diff options
| author | Tommie Gannert <tommie@gannert.se> | 2016-08-01 14:34:39 +0100 |
|---|---|---|
| committer | Tommie Gannert <tommie@gannert.se> | 2016-08-14 11:52:27 +0100 |
| commit | 7728cff37044943b05c4f9de5e9c6ef3d9e14a12 (patch) | |
| tree | 4b0c6dc62f30692624367f9d53fac933fa424f36 | |
| parent | 185d70ecbb2470468ab34229e6c461094a4cceb8 (diff) | |
Make print_disk_info, print_eth_info and print_wireless_info compile on NetBSD without warnings.
| -rw-r--r-- | src/print_disk_info.c | 6 | ||||
| -rw-r--r-- | src/print_eth_info.c | 2 | ||||
| -rw-r--r-- | src/print_wireless_info.c | 6 |
3 files changed, 13 insertions, 1 deletions
diff --git a/src/print_disk_info.c b/src/print_disk_info.c index 629e05b..edc69ac 100644 --- a/src/print_disk_info.c +++ b/src/print_disk_info.c @@ -10,6 +10,7 @@ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || (__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) #include <sys/param.h> #include <sys/mount.h> +#elif defined(__NetBSD__) #else #include <mntent.h> #endif @@ -121,6 +122,11 @@ void print_disk_info(yajl_gen json_gen, char *buffer, const char *path, const ch if (statfs(path, &buf) == -1) return; +#elif defined(__NetBSD__) + struct statvfs buf; + + if (statvfs(path, &buf) == -1) + return; #else struct statvfs buf; diff --git a/src/print_eth_info.c b/src/print_eth_info.c index 34ffa36..e4bf15e 100644 --- a/src/print_eth_info.c +++ b/src/print_eth_info.c @@ -79,7 +79,7 @@ static int print_eth_speed(char *outwalk, const char *interface) { ethspeed = (desc->ifmt_string != NULL ? desc->ifmt_string : "?"); return sprintf(outwalk, "%s", ethspeed); #elif defined(__OpenBSD__) || defined(__NetBSD__) - char *ethspeed; + const char *ethspeed; struct ifmediareq ifmr; (void)memset(&ifmr, 0, sizeof(ifmr)); diff --git a/src/print_wireless_info.c b/src/print_wireless_info.c index 70dbdb4..14879eb 100644 --- a/src/print_wireless_info.c +++ b/src/print_wireless_info.c @@ -57,6 +57,12 @@ #define IW_ESSID_MAX_SIZE IEEE80211_NWID_LEN #endif +#ifdef __NetBSD__ +#include <sys/types.h> +#include <net80211/ieee80211.h> +#define IW_ESSID_MAX_SIZE IEEE80211_NWID_LEN +#endif + #include "i3status.h" #define WIRELESS_INFO_FLAG_HAS_ESSID (1 << 0) |