From: Martin Willi <martin@revosec.ch>
Date: Thu, 2 Jan 2014 13:29:35 +0000 (+0100)
Subject: windows: Overload sleep() cancellable when it is defined in <unistd.h>
X-Git-Tag: 5.2.0dr6~24^2~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d50dd47ef3876ee730495fcfa0a383d5a946131;p=thirdparty%2Fstrongswan.git

windows: Overload sleep() cancellable when it is defined in <unistd.h>
---

diff --git a/src/libstrongswan/utils/windows.h b/src/libstrongswan/utils/windows.h
index 3e317ce592..2de6f043b4 100644
--- a/src/libstrongswan/utils/windows.h
+++ b/src/libstrongswan/utils/windows.h
@@ -25,6 +25,7 @@
 #include <ws2tcpip.h>
 #include <direct.h>
 #include <inttypes.h>
+#include <unistd.h>
 
 /* undef Windows variants evaluating values more than once */
 #undef min
@@ -79,7 +80,8 @@ static inline int sched_yield(void)
 /**
  * Replacement of sleep(3), cancellable by thread_cancel()
  */
-static inline int sleep(unsigned int seconds)
+#define sleep sleep_cancellable
+static inline int sleep_cancellable(unsigned int seconds)
 {
 	SleepEx(seconds * 1000, TRUE);
 	return 0;