svn commit: r1613463 - in /zookeeper/trunk: CHANGES.txt src/c/src/zookeeper.c

[ph...@apache.org]

Author: phunt
Date: Fri Jul 25 16:23:40 2014
New Revision: 1613463

URL: http://svn.apache.org/r1613463
Log:
ZOOKEEPER-1974. winvs2008 jenkins job failing with "unresolved external symbol" (flavio via phunt)

Modified:
    zookeeper/trunk/CHANGES.txt
    zookeeper/trunk/src/c/src/zookeeper.c

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1613463&r1=1613462&r2=1613463&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Fri Jul 25 16:23:40 2014
@@ -741,6 +741,9 @@ BUGFIXES:
   ZOOKEEPER-1877. Malformed ACL Id can crash server with skipACL=yes
   (Chris Chen via phunt)
 
+  ZOOKEEPER-1974. winvs2008 jenkins job failing with "unresolved
+  external symbol" (flavio via phunt)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,

Modified: zookeeper/trunk/src/c/src/zookeeper.c
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/c/src/zookeeper.c?rev=1613463&r1=1613462&r2=1613463&view=diff
==============================================================================
--- zookeeper/trunk/src/c/src/zookeeper.c (original)
+++ zookeeper/trunk/src/c/src/zookeeper.c Fri Jul 25 16:23:40 2014
@@ -2004,8 +2004,9 @@ static void zookeeper_set_sock_noblock(z
 
 static void zookeeper_set_sock_timeout(zhandle_t *zh, socket_t s, int timeout)
 {
-    struct timeval tv = { .tv_sec = timeout };
+    struct timeval tv;
 
+    tv.tv_sec = timeout;
     setsockopt(s, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(struct timeval));
     setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(struct timeval));
 }