Merge branch 'master' into master

diff --combined src/first_network_device.c
index 430f1d5b5418100353e1df6a77e69d3a52da3cc5,1ed50a266aa8d438da68ed5d774325732ede6a62..b930f5357a709e803c635b499132b6cd160a5cb1
--- 1/src/first_network_device.c
--- 2/src/first_network_device.c
+++ b/src/first_network_device.c
@@@ -14,10 -14,10 +14,10 @@@
  
  #include "i3status.h"
  
 -#ifdef __linux__
 -#define LOOPBACK_DEV "lo"
 -#else
 +#ifdef __OpenBSD__
  #define LOOPBACK_DEV "lo0"
 +#else
 +#define LOOPBACK_DEV "lo"
  #endif
  
  static bool sysfs_devtype(char *dest, size_t n, const char *ifnam) {
@@@ -67,7 -67,22 +67,7 @@@ static bool is_virtual(const char *ifna
  }
  
  static net_type_t iface_type(const char *ifname) {
 -#ifdef __linux__
 -    char devtype[32];
 -
 -    if (!sysfs_devtype(devtype, sizeof(devtype), ifname))
 -        return NET_TYPE_OTHER;
 -
 -    /* Default to Ethernet when no devtype is available */
 -    if (!devtype[0])
 -        return NET_TYPE_ETHERNET;
 -
 -    if (strcmp(devtype, "wlan") == 0)
 -        return NET_TYPE_WIRELESS;
 -
 -    if (strcmp(devtype, "wwan") == 0)
 -        return NET_TYPE_OTHER;
 -#elif __OpenBSD__
 +#ifdef __OpenBSD__
      /*
       *First determine if the device is a wireless device by trying two ioctl(2)
       * commands against it. If either succeeds we can be sure it's a wireless
@@@ -109,24 -124,8 +109,25 @@@
          close(s);
          return NET_TYPE_ETHERNET;
      }
 +#else
 +    char devtype[32];
 +
 +    if (!sysfs_devtype(devtype, sizeof(devtype), ifname))
 +        return NET_TYPE_OTHER;
 +
 +    /* Default to Ethernet when no devtype is available */
 +    if (!devtype[0])
 +        return NET_TYPE_ETHERNET;
 +
 +    if (strcmp(devtype, "wlan") == 0)
 +        return NET_TYPE_WIRELESS;
 +
 +    if (strcmp(devtype, "wwan") == 0)
 +        return NET_TYPE_OTHER;
 +
 +    return NET_TYPE_OTHER;
  #endif
+     return NET_TYPE_OTHER;
  }
  
  const char *first_eth_interface(const net_type_t type) {