Author: michim
Date: Thu Oct 16 04:54:19 2014
New Revision: 1632212
URL: http://svn.apache.org/r1632212
Log:
ZOOKEEPER-2049 Yosemite build failure: htonll conflict (Till Toenshoff via
michim)
Modified:
zookeeper/branches/branch-3.4/CHANGES.txt
zookeeper/branches/branch-3.4/src/c/include/recordio.h
zookeeper/branches/branch-3.4/src/c/src/recordio.c
zookeeper/branches/branch-3.4/src/c/src/zookeeper.c
zookeeper/branches/branch-3.4/src/c/tests/ZKMocks.cc
Modified: zookeeper/branches/branch-3.4/CHANGES.txt
URL:
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1632212&r1=1632211&r2=1632212&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Thu Oct 16 04:54:19 2014
@@ -46,6 +46,9 @@ BUGFIXES:
ZOOKEEPER-2026 Startup order in ServerCnxnFactory-ies is wrong (Stevo Slavic
via rakeshr)
+ ZOOKEEPER-2049 Yosemite build failure: htonll conflict (Till Toenshoff via
+ michim)
+
IMPROVEMENTS:
ZOOKEEPER-1575. adding .gitattributes to prevent CRLF and LF mismatches for
Modified: zookeeper/branches/branch-3.4/src/c/include/recordio.h
URL:
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/c/include/recordio.h?rev=1632212&r1=1632211&r2=1632212&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/c/include/recordio.h (original)
+++ zookeeper/branches/branch-3.4/src/c/include/recordio.h Thu Oct 16 04:54:19
2014
@@ -73,7 +73,7 @@ void close_buffer_iarchive(struct iarchi
char *get_buffer(struct oarchive *);
int get_buffer_len(struct oarchive *);
-int64_t htonll(int64_t v);
+int64_t zoo_htonll(int64_t v);
#ifdef __cplusplus
}
Modified: zookeeper/branches/branch-3.4/src/c/src/recordio.c
URL:
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/c/src/recordio.c?rev=1632212&r1=1632211&r2=1632212&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/c/src/recordio.c (original)
+++ zookeeper/branches/branch-3.4/src/c/src/recordio.c Thu Oct 16 04:54:19 2014
@@ -80,7 +80,7 @@ int oa_serialize_int(struct oarchive *oa
priv->off+=sizeof(i);
return 0;
}
-int64_t htonll(int64_t v)
+int64_t zoo_htonll(int64_t v)
{
int i = 0;
char *s = (char *)&v;
@@ -98,7 +98,7 @@ int64_t htonll(int64_t v)
int oa_serialize_long(struct oarchive *oa, const char *tag, const int64_t *d)
{
- const int64_t i = htonll(*d);
+ const int64_t i = zoo_htonll(*d);
struct buff_struct *priv = oa->priv;
if ((priv->len - priv->off) < sizeof(i)) {
int rc = resize_buffer(priv, priv->len + sizeof(i));
@@ -207,7 +207,7 @@ int ia_deserialize_long(struct iarchive
}
memcpy(count, priv->buffer+priv->off, sizeof(*count));
priv->off+=sizeof(*count);
- v = htonll(*count); // htonll and ntohll do the same
+ v = zoo_htonll(*count); // htonll and ntohll do the same
*count = v;
return 0;
}
Modified: zookeeper/branches/branch-3.4/src/c/src/zookeeper.c
URL:
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/c/src/zookeeper.c?rev=1632212&r1=1632211&r2=1632212&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/c/src/zookeeper.c (original)
+++ zookeeper/branches/branch-3.4/src/c/src/zookeeper.c Thu Oct 16 04:54:19 2014
@@ -1408,7 +1408,7 @@ static int serialize_prime_connect(struc
memcpy(buffer + offset, &req->protocolVersion,
sizeof(req->protocolVersion));
offset = offset + sizeof(req->protocolVersion);
- req->lastZxidSeen = htonll(req->lastZxidSeen);
+ req->lastZxidSeen = zoo_htonll(req->lastZxidSeen);
memcpy(buffer + offset, &req->lastZxidSeen, sizeof(req->lastZxidSeen));
offset = offset + sizeof(req->lastZxidSeen);
@@ -1416,7 +1416,7 @@ static int serialize_prime_connect(struc
memcpy(buffer + offset, &req->timeOut, sizeof(req->timeOut));
offset = offset + sizeof(req->timeOut);
- req->sessionId = htonll(req->sessionId);
+ req->sessionId = zoo_htonll(req->sessionId);
memcpy(buffer + offset, &req->sessionId, sizeof(req->sessionId));
offset = offset + sizeof(req->sessionId);
@@ -1447,7 +1447,7 @@ static int serialize_prime_connect(struc
memcpy(&req->sessionId, buffer + offset, sizeof(req->sessionId));
offset = offset + sizeof(req->sessionId);
- req->sessionId = htonll(req->sessionId);
+ req->sessionId = zoo_htonll(req->sessionId);
memcpy(&req->passwd_len, buffer + offset, sizeof(req->passwd_len));
offset = offset + sizeof(req->passwd_len);
Modified: zookeeper/branches/branch-3.4/src/c/tests/ZKMocks.cc
URL:
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/c/tests/ZKMocks.cc?rev=1632212&r1=1632211&r2=1632212&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/c/tests/ZKMocks.cc (original)
+++ zookeeper/branches/branch-3.4/src/c/tests/ZKMocks.cc Thu Oct 16 04:54:19
2014
@@ -41,7 +41,7 @@ HandshakeRequest* HandshakeRequest::pars
int offset=sizeof(req->protocolVersion);
memcpy(&req->lastZxidSeen,buf.data()+offset,sizeof(req->lastZxidSeen));
- req->lastZxidSeen = htonll(req->lastZxidSeen);
+ req->lastZxidSeen = zoo_htonll(req->lastZxidSeen);
offset+=sizeof(req->lastZxidSeen);
memcpy(&req->timeOut,buf.data()+offset,sizeof(req->timeOut));
@@ -49,7 +49,7 @@ HandshakeRequest* HandshakeRequest::pars
offset+=sizeof(req->timeOut);
memcpy(&req->sessionId,buf.data()+offset,sizeof(req->sessionId));
- req->sessionId = htonll(req->sessionId);
+ req->sessionId = zoo_htonll(req->sessionId);
offset+=sizeof(req->sessionId);
memcpy(&req->passwd_len,buf.data()+offset,sizeof(req->passwd_len));
@@ -322,7 +322,7 @@ string HandshakeResponse::toString() con
buf.append((char*)&tmp,sizeof(tmp));
tmp=htonl(timeOut);
buf.append((char*)&tmp,sizeof(tmp));
- int64_t tmp64=htonll(sessionId);
+ int64_t tmp64=zoo_htonll(sessionId);
buf.append((char*)&tmp64,sizeof(sessionId));
tmp=htonl(passwd_len);
buf.append((char*)&tmp,sizeof(tmp));
