Return-Path: 
 <commits-return-3460-apmail-zookeeper-commits-archive=zookeeper.apache.org@zookeeper.apache.org>
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 785D9104AC
	for <apmail-zookeeper-commits-archive@www.apache.org>;
 Mon, 14 Oct 2013 23:57:16 +0000 (UTC)
Received: (qmail 18526 invoked by uid 500); 14 Oct 2013 23:57:16 -0000
Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org
Received: (qmail 18496 invoked by uid 500); 14 Oct 2013 23:57:15 -0000
Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@zookeeper.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@zookeeper.apache.org>
List-Post: <mailto:commits@zookeeper.apache.org>
List-Id: <commits.zookeeper.apache.org>
Reply-To: dev@<zookeeper.apache.org>
Delivered-To: mailing list commits@zookeeper.apache.org
Received: (qmail 18487 invoked by uid 99); 14 Oct 2013 23:57:15 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Oct 2013 23:57:15 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Oct 2013 23:57:13 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id D78392388831;
	Mon, 14 Oct 2013 23:56:53 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1532152 - in /zookeeper/trunk: CHANGES.txt
 src/c/tests/TestReconfigServer.cc src/c/tests/ZooKeeperQuorumServer.cc
Date: Mon, 14 Oct 2013 23:56:53 -0000
To: commits@zookeeper.apache.org
From: phunt@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20131014235653.D78392388831@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: phunt
Date: Mon Oct 14 23:56:53 2013
New Revision: 1532152

URL: http://svn.apache.org/r1532152
Log:
ZOOKEEPER-1795. unable to build c client on ubuntu (Raul Gutierrez Segales via phunt)

Modified:
    zookeeper/trunk/CHANGES.txt
    zookeeper/trunk/src/c/tests/TestReconfigServer.cc
    zookeeper/trunk/src/c/tests/ZooKeeperQuorumServer.cc

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1532152&r1=1532151&r2=1532152&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Mon Oct 14 23:56:53 2013
@@ -445,6 +445,9 @@ BUGFIXES:
   ZOOKEEPER-1610. Some classes are using == or != to compare
   Long/String objects instead of .equals() (Edward Ribeiro via phunt)
 
+  ZOOKEEPER-1795. unable to build c client on ubuntu
+  (Raul Gutierrez Segales via phunt)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,

Modified: zookeeper/trunk/src/c/tests/TestReconfigServer.cc
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/c/tests/TestReconfigServer.cc?rev=1532152&r1=1532151&r2=1532152&view=diff
==============================================================================
--- zookeeper/trunk/src/c/tests/TestReconfigServer.cc (original)
+++ zookeeper/trunk/src/c/tests/TestReconfigServer.cc Mon Oct 14 23:56:53 2013
@@ -16,6 +16,7 @@
  */
 #include <algorithm>
 #include <cppunit/extensions/HelperMacros.h>
+#include <unistd.h>
 #include "zookeeper.h"
 
 #include "Util.h"

Modified: zookeeper/trunk/src/c/tests/ZooKeeperQuorumServer.cc
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/c/tests/ZooKeeperQuorumServer.cc?rev=1532152&r1=1532151&r2=1532152&view=diff
==============================================================================
--- zookeeper/trunk/src/c/tests/ZooKeeperQuorumServer.cc (original)
+++ zookeeper/trunk/src/c/tests/ZooKeeperQuorumServer.cc Mon Oct 14 23:56:53 2013
@@ -21,6 +21,7 @@
 #include <cstdlib>
 #include <fstream>
 #include <sstream>
+#include <unistd.h>
 
 ZooKeeperQuorumServer::
 ZooKeeperQuorumServer(uint32_t id, uint32_t numServers) :