Author: phunt
Date: Thu Oct 17 17:07:44 2013
New Revision: 1533161
URL: http://svn.apache.org/r1533161
Log:
ZOOKEEPER-1646. mt c client tests fail on Ubuntu Raring (phunt)
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/src/c/tests/LibCMocks.cc
Modified: zookeeper/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1533161&r1=1533160&r2=1533161&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Thu Oct 17 17:07:44 2013
@@ -448,6 +448,8 @@ BUGFIXES:
ZOOKEEPER-1795. unable to build c client on ubuntu
(Raul Gutierrez Segales via phunt)
+ ZOOKEEPER-1646. mt c client tests fail on Ubuntu Raring (phunt)
+
IMPROVEMENTS:
ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,
Modified: zookeeper/trunk/src/c/tests/LibCMocks.cc
URL:
http://svn.apache.org/viewvc/zookeeper/trunk/src/c/tests/LibCMocks.cc?rev=1533161&r1=1533160&r2=1533161&view=diff
==============================================================================
--- zookeeper/trunk/src/c/tests/LibCMocks.cc (original)
+++ zookeeper/trunk/src/c/tests/LibCMocks.cc Thu Oct 17 17:07:44 2013
@@ -310,6 +310,17 @@ int poll(struct pollfd *fds, POLL_NFDS_T
}
+/*
+ * Recent gcc with -O2 and glibc FORTIFY feature may cause our poll
+ * mock to be ignored.
+ */
+#if __USE_FORTIFY_LEVEL > 0
+int __poll_chk (struct pollfd *__fds, nfds_t __nfds, int __timeout,
+ __SIZE_TYPE__ __fdslen) {
+ return poll(__fds, __nfds, __timeout);
+}
+#endif
+
//
*****************************************************************************
// gettimeofday
int gettimeofday(struct timeval *tp, GETTIMEOFDAY_ARG2_TYPE tzp){
