Return-Path: X-Original-To: apmail-zookeeper-commits-archive@www.apache.org Delivered-To: apmail-zookeeper-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DAF0E17BBE for ; Wed, 21 Oct 2015 22:12:17 +0000 (UTC) Received: (qmail 88308 invoked by uid 500); 21 Oct 2015 22:12:17 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 88255 invoked by uid 500); 21 Oct 2015 22:12:17 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 88244 invoked by uid 99); 21 Oct 2015 22:12:17 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Oct 2015 22:12:17 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 27DC6C0FC5 for ; Wed, 21 Oct 2015 22:12:17 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.79 X-Spam-Level: * X-Spam-Status: No, score=1.79 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id 83MjnwGAr-cB for ; Wed, 21 Oct 2015 22:12:16 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with ESMTP id 24528428E4 for ; Wed, 21 Oct 2015 22:12:16 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id B6D21E0183 for ; Wed, 21 Oct 2015 22:12:15 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id B2B7D3A0018 for ; Wed, 21 Oct 2015 22:12:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1709929 - in /zookeeper/branches/branch-3.4: CHANGES.txt src/c/src/zookeeper.c Date: Wed, 21 Oct 2015 22:12:15 -0000 To: commits@zookeeper.apache.org From: cnauroth@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20151021221215.B2B7D3A0018@svn01-us-west.apache.org> 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 {