From b84202aa9a3f757bf0f1a8f895cadf26d07ad3b4 Mon Sep 17 00:00:00 2001 From: walker0643 <> Date: Tue, 3 Jul 2018 23:09:00 -0400 Subject: [PATCH] change order of headers and leave out wireless checking on osx for now --- src/gui/src/unix/DefaultInterfaceIP.cpp | 20 +++++++++++++------- src/gui/src/unix/SocketResource.h | 1 + 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/gui/src/unix/DefaultInterfaceIP.cpp b/src/gui/src/unix/DefaultInterfaceIP.cpp index b276b202..d5c89cec 100644 --- a/src/gui/src/unix/DefaultInterfaceIP.cpp +++ b/src/gui/src/unix/DefaultInterfaceIP.cpp @@ -1,18 +1,23 @@ -#include -#include -#include -#include -#include -#include -#include +#include #include "SocketResource.h" #include "IfAddrsResource.h" +#include +#include +#include + +#ifdef __linux__ +#include +#endif + +#include +#include namespace Debauchee { static bool is_wireless(const char * ifname) { +#ifdef __linux__ if (ifname) { SocketResource fd(AF_INET, SOCK_STREAM, 0); if (fd.is_valid()) { @@ -21,6 +26,7 @@ static bool is_wireless(const char * ifname) return ioctl(fd, SIOCGIWMODE, req) >= 0; } } +#endif return false; } diff --git a/src/gui/src/unix/SocketResource.h b/src/gui/src/unix/SocketResource.h index bff23e44..57eb1727 100644 --- a/src/gui/src/unix/SocketResource.h +++ b/src/gui/src/unix/SocketResource.h @@ -1,5 +1,6 @@ #include #include +#include namespace Debauchee {