Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
TPF
jacktrip
Commits
65e789a1
Unverified
Commit
65e789a1
authored
Jul 21, 2020
by
Aaron Wyatt
Committed by
GitHub
Jul 21, 2020
Browse files
Merge pull request #86 from jacktrip/Define-fix
Fix OSX defines in UdpDataProtocol
parents
5217d5e3
3daf4d40
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/UdpDataProtocol.cpp
View file @
65e789a1
...
...
@@ -51,7 +51,7 @@
#include
<winsock2.h>
//cc need SD_SEND
#include
<ws2tcpip.h>
// for IPv6
#endif
#if defined (__LINUX__) || (__MAC_
_
OSX__)
#if defined (__LINUX__) || (__MAC_OSX__)
#include
<sys/socket.h>
// for POSIX Sockets
#endif
...
...
@@ -101,7 +101,7 @@ UdpDataProtocol::~UdpDataProtocol()
void
UdpDataProtocol
::
setPeerAddress
(
const
char
*
peerHostOrIP
)
{
// Get DNS Address
#if defined (__LINUX__) || (__MAC_
_
OSX__)
#if defined (__LINUX__) || (__MAC_OSX__)
//Don't make the following code conditional on windows
//(Addresses a weird timing bug when in hub client mode)
if
(
!
mPeerAddress
.
setAddress
(
peerHostOrIP
))
{
...
...
@@ -113,7 +113,7 @@ void UdpDataProtocol::setPeerAddress(const char* peerHostOrIP)
}
//cout << "UdpDataProtocol::setPeerAddress IP Address Number: "
// << mPeerAddress.toString().toStdString() << endl;
#if defined (__LINUX__) || (__MAC_
_
OSX__)
#if defined (__LINUX__) || (__MAC_OSX__)
}
#endif
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment