Author: cnauroth
Date: Wed Oct 21 22:12:15 2015
New Revision: 1709929
URL: http://svn.apache.org/viewvc?rev=1709929&view=rev
Log:
ZOOKEEPER-2296: compilation broken for 3.4 (Raul Gutierrez Segales via cnauroth)
Modified:
zookeeper/branches/branch-3.4/CHANGES.txt
zookeeper/branches/branch-3.4/src/c/src/zookeeper.c
Modified: zookeeper/branches/branch-3.4/CHANGES.txt
URL:
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1709929&r1=1709928&r2=1709929&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Wed Oct 21 22:12:15 2015
@@ -132,6 +132,9 @@ BUGFIXES:
ZOOKEEPER-2268: Zookeeper doc creation fails on windows
(Arshad Mohammad via cnauroth)
+ ZOOKEEPER-2296: compilation broken for 3.4
+ (Raul Gutierrez Segales via cnauroth)
+
IMPROVEMENTS:
ZOOKEEPER-1575. adding .gitattributes to prevent CRLF and LF mismatches for
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=1709929&r1=1709928&r2=1709929&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/c/src/zookeeper.c (original)
+++ zookeeper/branches/branch-3.4/src/c/src/zookeeper.c Wed Oct 21 22:12:15 2015
@@ -2196,7 +2196,7 @@ int zookeeper_process(zhandle_t *zh, int
struct timeval now;
gettimeofday(&now, 0);
elapsed = calculate_interval(&zh->last_ping, &now);
- LOG_DEBUG(LOGCALLBACK(zh), "Got ping response in %d ms", elapsed);
+ LOG_DEBUG(("Got ping response in %d ms", elapsed));
free_buffer(bptr);
} else if (hdr.xid == WATCHER_EVENT_XID) {
struct WatcherEvent evt;
@@ -2265,7 +2265,7 @@ int zookeeper_process(zhandle_t *zh, int
activateWatcher(zh, cptr->watcher, rc);
if (cptr->c.void_result != SYNCHRONOUS_MARKER) {
- LOG_DEBUG(LOGCALLBACK(zh), "Queueing asynchronous response");
+ LOG_DEBUG(("Queueing asynchronous response"));
cptr->buffer = bptr;
queue_completion(&zh->completions_to_process, cptr, 0);
} else {
