mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 15:49:24 +02:00
added back arpa/inet.h and ifaddrs.h for mac and unix
This commit is contained in:
parent
ff6e9c0416
commit
f445a391b7
4 changed files with 14 additions and 6 deletions
|
@ -6,7 +6,10 @@
|
||||||
// Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
|
// 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 <string.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
|
@ -47,7 +50,7 @@ void PairingHandler::sendPairRequest() {
|
||||||
(localAddress >> 24) & 0xFF,
|
(localAddress >> 24) & 0xFF,
|
||||||
NodeList::getInstance()->getNodeSocket().localPort());
|
NodeList::getInstance()->getNodeSocket().localPort());
|
||||||
qDebug("Sending pair packet: %s", pairPacket);
|
qDebug("Sending pair packet: %s", pairPacket);
|
||||||
|
|
||||||
HifiSockAddr pairingServerSocket(PAIRING_SERVER_HOSTNAME, PAIRING_SERVER_PORT);
|
HifiSockAddr pairingServerSocket(PAIRING_SERVER_HOSTNAME, PAIRING_SERVER_PORT);
|
||||||
|
|
||||||
// send the pair request to the pairing server
|
// send the pair request to the pairing server
|
||||||
|
|
|
@ -12,8 +12,11 @@
|
||||||
#define __shared_NetworkPacket__
|
#define __shared_NetworkPacket__
|
||||||
|
|
||||||
#include <stdlib.h>
|
#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"
|
#include "HifiSockAddr.h"
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#include "Syssocket.h"
|
#include "Syssocket.h"
|
||||||
#else
|
#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
|
#endif
|
||||||
|
|
||||||
#include "Node.h"
|
#include "Node.h"
|
||||||
|
|
|
@ -11,7 +11,9 @@
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
#include <cstring>
|
#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;
|
const int INET_ADDR_STRLEN = 16;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue