[dasher] Fix socket vs <functional> conflict.
- From: Patrick Welche <pwelche src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dasher] Fix socket vs <functional> conflict.
- Date: Wed, 19 Aug 2020 10:32:53 +0000 (UTC)
commit 8b5b5ef4f373413a18f12e9d5028f81dd05a538e
Author: Joerg Sonnenberger <joerg NetBSD org>
Date: Wed Aug 19 11:31:35 2020 +0100
Fix socket vs <functional> conflict.
Src/DasherCore/SocketInputBase.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/Src/DasherCore/SocketInputBase.cpp b/Src/DasherCore/SocketInputBase.cpp
index 5338f3cb..b19d8f5b 100644
--- a/Src/DasherCore/SocketInputBase.cpp
+++ b/Src/DasherCore/SocketInputBase.cpp
@@ -112,7 +112,7 @@ bool Dasher::CSocketInputBase::StartListening() {
name.sin_family = AF_INET;
name.sin_port = htons(port);
name.sin_addr.s_addr = htonl(INADDR_ANY);
- if(bind(sock, (struct sockaddr *)&name, sizeof(name)) < 0) {
+ if(::bind(sock, (struct sockaddr *)&name, sizeof(name)) < 0) {
ReportErrnoError(_("Error binding to socket - already in use?"));
DASHER_SOCKET_CLOSE_FUNCTION(sock);
sock = -1;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]