Jelajahi Sumber

ZOOKEEPER-1974. winvs2008 jenkins job failing with "unresolved external symbol" (flavio via phunt)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1613463 13f79535-47bb-0310-9956-ffa450edef68
Patrick D. Hunt 11 tahun lalu
induk
melakukan
877a731524
2 mengubah file dengan 5 tambahan dan 1 penghapusan
  1. 3 0
      CHANGES.txt
  2. 2 1
      src/c/src/zookeeper.c

+ 3 - 0
CHANGES.txt

@@ -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,

+ 2 - 1
src/c/src/zookeeper.c

@@ -2004,8 +2004,9 @@ static void zookeeper_set_sock_noblock(zhandle_t *zh, socket_t sock)
 
 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));
 }