svn commit: r1683163 - in /zookeeper/trunk: CHANGES.txt src/c/include/winconfig.h src/c/src/zookeeper.c

[rg...@apache.org]

Author: rgs
Date: Tue Jun  2 19:17:09 2015
New Revision: 1683163

URL: http://svn.apache.org/r1683163
Log:
ZOOKEEPER-2096: C client builds with incorrect error codes in VisualStudio 2010+
(Vitaly Stakhovsky via rgs)

Modified:
    zookeeper/trunk/CHANGES.txt
    zookeeper/trunk/src/c/include/winconfig.h
    zookeeper/trunk/src/c/src/zookeeper.c

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1683163&r1=1683162&r2=1683163&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Tue Jun  2 19:17:09 2015
@@ -111,6 +111,9 @@ BUGFIXES:
   ZOOKEEPER-2197 non-ascii character in FinalRequestProcessor.java
   (Michi Mutsuzaki via rgs)
 
+  ZOOKEEPER-2096: C client builds with incorrect error codes in VisualStudio 2010+
+  (Vitaly Stakhovsky via rgs)
+
 IMPROVEMENTS:
   ZOOKEEPER-1660 Documentation for Dynamic Reconfiguration (Reed Wanderman-Milne via shralex)  
 

Modified: zookeeper/trunk/src/c/include/winconfig.h
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/c/include/winconfig.h?rev=1683163&r1=1683162&r2=1683163&view=diff
==============================================================================
--- zookeeper/trunk/src/c/include/winconfig.h (original)
+++ zookeeper/trunk/src/c/include/winconfig.h Tue Jun  2 19:17:09 2015
@@ -184,8 +184,13 @@
 #define EHOSTDOWN EPIPE
 #define ESTALE ENODEV
 
+#ifndef EWOULDBLOCK
 #define EWOULDBLOCK WSAEWOULDBLOCK
+#endif
+
+#ifndef EINPROGRESS
 #define EINPROGRESS WSAEINPROGRESS
+#endif
 
 typedef int pid_t;
 #endif

Modified: zookeeper/trunk/src/c/src/zookeeper.c
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/c/src/zookeeper.c?rev=1683163&r1=1683162&r2=1683163&view=diff
==============================================================================
--- zookeeper/trunk/src/c/src/zookeeper.c (original)
+++ zookeeper/trunk/src/c/src/zookeeper.c Tue Jun  2 19:17:09 2015
@@ -2109,6 +2109,16 @@ static socket_t zookeeper_connect(zhandl
 
 #ifdef _WIN32
     get_errno();
+#if _MSC_VER >= 1600
+    switch(errno) {
+    case WSAEWOULDBLOCK:
+        errno = EWOULDBLOCK;
+        break;
+    case WSAEINPROGRESS:
+        errno = EINPROGRESS;
+        break;
+    }
+#endif
 #endif
 
     return rc;