X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fplatform%2Fwindows%2Fos-socket.h;h=0c3855558ddeb7b164d151cb3e1e50ca0fa1cdee;hb=2b44051cbfa70deafc30d9767323214debbc1a75;hp=86750c50b9bc4e51d5abe56d8ee8a09f253a4341;hpb=5347b94bbd7455453754fd79b6aaa64aa368ce59;p=deb_libcec.git

diff --git a/src/lib/platform/windows/os-socket.h b/src/lib/platform/windows/os-socket.h
index 86750c5..0c38555 100644
--- a/src/lib/platform/windows/os-socket.h
+++ b/src/lib/platform/windows/os-socket.h
@@ -31,8 +31,8 @@
  *     http://www.pulse-eight.net/
  */
 
-#include "../os.h"
-#include "../util/timeutils.h"
+#include "lib/platform/os.h"
+#include "lib/platform/util/timeutils.h"
 
 #include <ws2spi.h>
 #include <ws2ipdef.h>
@@ -95,8 +95,6 @@ namespace PLATFORM
 
   inline ssize_t SerialSocketRead(serial_socket_t socket, int *iError, void* data, size_t len, uint64_t iTimeoutMs /*= 0*/)
   {
-    *iError = 0;
-
     if (len != (DWORD)len)
     {
       *iError = EINVAL;
@@ -183,7 +181,9 @@ namespace PLATFORM
         tv.tv_usec = 1000 * (long)(iTimeoutMs % 1000);
 
         FD_ZERO(&fd_read);
+        #pragma warning(disable:4127) /* disable 'conditional expression is constant' */
         FD_SET(socket, &fd_read);
+        #pragma warning(default:4127)
 
         if (select((int)socket + 1, &fd_read, NULL, NULL, &tv) == 0)
         {
@@ -272,8 +272,10 @@ namespace PLATFORM
 
         FD_ZERO(&fd_write);
         FD_ZERO(&fd_except);
+        #pragma warning(disable:4127) /* disable 'conditional expression is constant' */
         FD_SET(socket, &fd_write);
         FD_SET(socket, &fd_except);
+        #pragma warning(default:4127)
 
         int iPollResult = select(sizeof(socket)*8, NULL, &fd_write, &fd_except, &tv);
         if (iPollResult == 0)