From: Martin Willi <martin@revosec.ch>
Date: Thu, 6 Nov 2014 13:20:28 +0000 (+0100)
Subject: watcher: Use Windows read/write(2) wrappers instead of compile-conditions
X-Git-Tag: 5.2.2dr1~34^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e1d3f3615c48f5357fd339c57735aad0d03effa;p=thirdparty%2Fstrongswan.git

watcher: Use Windows read/write(2) wrappers instead of compile-conditions
---

diff --git a/src/libstrongswan/processing/watcher.c b/src/libstrongswan/processing/watcher.c
index 07c1b6dc94..9eaa3f142b 100644
--- a/src/libstrongswan/processing/watcher.c
+++ b/src/libstrongswan/processing/watcher.c
@@ -118,11 +118,7 @@ static void update(private_watcher_t *this)
 	this->pending = TRUE;
 	if (this->notify[1] != -1)
 	{
-#ifdef WIN32
-		if (send(this->notify[1], buf, sizeof(buf), 0) == -1)
-#else
 		if (write(this->notify[1], buf, sizeof(buf)) == -1)
-#endif
 		{
 			DBG1(DBG_JOB, "notifying watcher failed: %s", strerror(errno));
 		}
@@ -338,11 +334,7 @@ static job_requeue_t watch(private_watcher_t *this)
 			{
 				while (TRUE)
 				{
-#ifdef WIN32
-					len = recv(this->notify[0], buf, sizeof(buf), 0);
-#else
 					len = read(this->notify[0], buf, sizeof(buf));
-#endif
 					if (len == -1)
 					{
 						if (errno != EAGAIN && errno != EWOULDBLOCK)