From f445a391b70169521c675a32afe7504d266cfbc6 Mon Sep 17 00:00:00 2001
From: Brad Hefta-Gaub <brad@highfidelity.io>
Date: Wed, 15 Jan 2014 15:03:03 -0800
Subject: [PATCH] added back arpa/inet.h and ifaddrs.h for mac and unix

---
 interface/src/PairingHandler.cpp     | 7 +++++--
 libraries/shared/src/NetworkPacket.h | 7 +++++--
 libraries/shared/src/Node.cpp        | 2 +-
 pairing-server/src/main.cpp          | 4 +++-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/interface/src/PairingHandler.cpp b/interface/src/PairingHandler.cpp
index b06a6248e4..a710ebce7c 100644
--- a/interface/src/PairingHandler.cpp
+++ b/interface/src/PairingHandler.cpp
@@ -6,7 +6,10 @@
 //  Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
 //
 
-//#include <arpa/inet.h> // not available on windows, apparently not needed on mac
+#ifndef _WIN32
+#include <arpa/inet.h> // not available on windows
+#endif
+
 #include <string.h>
 #include <stdio.h>
 
@@ -47,7 +50,7 @@ void PairingHandler::sendPairRequest() {
             (localAddress >> 24) & 0xFF,
             NodeList::getInstance()->getNodeSocket().localPort());
     qDebug("Sending pair packet: %s", pairPacket);
-    
+
     HifiSockAddr pairingServerSocket(PAIRING_SERVER_HOSTNAME, PAIRING_SERVER_PORT);
 
     // send the pair request to the pairing server
diff --git a/libraries/shared/src/NetworkPacket.h b/libraries/shared/src/NetworkPacket.h
index 139c69bd35..7eef1e7129 100644
--- a/libraries/shared/src/NetworkPacket.h
+++ b/libraries/shared/src/NetworkPacket.h
@@ -12,8 +12,11 @@
 #define __shared_NetworkPacket__
 
 #include <stdlib.h>
-//#include <arpa/inet.h> // not available on windows, apparently not needed on mac
-//#include <ifaddrs.h>
+
+#ifndef _WIN32
+#include <arpa/inet.h> // not available on windows
+#include <ifaddrs.h>
+#endif
 
 #include "HifiSockAddr.h"
 
diff --git a/libraries/shared/src/Node.cpp b/libraries/shared/src/Node.cpp
index b07422969c..271629ff10 100644
--- a/libraries/shared/src/Node.cpp
+++ b/libraries/shared/src/Node.cpp
@@ -12,7 +12,7 @@
 #ifdef _WIN32
 #include "Syssocket.h"
 #else
-//#include <arpa/inet.h> // not available on windows, apparently not needed on mac
+#include <arpa/inet.h> // not available on windows, apparently not needed on mac
 #endif
 
 #include "Node.h"
diff --git a/pairing-server/src/main.cpp b/pairing-server/src/main.cpp
index 60795aeabc..2fc371b42c 100644
--- a/pairing-server/src/main.cpp
+++ b/pairing-server/src/main.cpp
@@ -11,7 +11,9 @@
 #include <cstdio>
 #include <cstring>
 
-//#include <arpa/inet.h> // not available on windows, apparently not needed on mac
+#ifndef _WIN32
+#include <arpa/inet.h> // not available on windows
+#endif
 
 const int INET_ADDR_STRLEN = 16;