From 76e2efb19b969329d7da156eeb27cb8a250a24e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Fri, 26 Apr 2019 11:50:25 -0400
Subject: [PATCH] peerdiscovery: undef write macro after use
---
src/peer_discovery.cpp | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/peer_discovery.cpp b/src/peer_discovery.cpp
index 0f9d2468..e8d10e02 100644
--- a/src/peer_discovery.cpp
+++ b/src/peer_discovery.cpp
@@ -29,7 +29,6 @@
typedef SSIZE_T ssize_t;
#endif
#define close(x) closesocket(x)
-#define write(s, b, f) send(s, b, (int)strlen(b), 0)
#else
#include <sys/types.h>
#include <unistd.h>
@@ -435,12 +434,18 @@ PeerDiscovery::DomainPeerDiscovery::stopPublish(const std::string &type)
void
PeerDiscovery::DomainPeerDiscovery::stopDiscovery()
{
+#ifdef _WIN32
+#define write(s, b, f) send((s), (b), (f), 0)
+#endif
drunning_ = false;
if (stop_writefd_ != -1) {
if (write(stop_writefd_, "\0", 1) == -1) {
- perror("write");
+ std::cerr << "Can't send stop message: " << strerror(errno) << std::endl;
}
}
+#ifdef _WIN32
+#undef write
+#endif
}
void
--
GitLab