Author: aconway
Date: Fri Nov 17 12:30:42 2006
New Revision: 476303
URL: http://svn.apache.org/viewvc?view=rev&rev=476303
Log:
Patch from Andrew Stitcher to fix APR #include using apr-config.
Fixed build problems with USE_APR= - builds OK but broker non-functional.
Removed:
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/posix/EpollEventChannelTest.cpp
Modified:
incubator/qpid/trunk/qpid/cpp/options.mk
incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRBase.h
incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRPool.h
incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRSocket.h
incubator/qpid/trunk/qpid/cpp/src/qpid/apr/LFProcessor.h
incubator/qpid/trunk/qpid/cpp/src/qpid/apr/LFSessionContext.h
incubator/qpid/trunk/qpid/cpp/src/qpid/posix/EpollEventChannel.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/posix/check.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Module.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Monitor.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Socket.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Thread.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Time.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/signal.h
Modified: incubator/qpid/trunk/qpid/cpp/options.mk
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/options.mk?view=diff&rev=476303&r1=476302&r2=476303
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/options.mk (original)
+++ incubator/qpid/trunk/qpid/cpp/options.mk Fri Nov 17 12:30:42 2006
@@ -36,12 +36,12 @@
ifdef USE_APR
PLATFORM := apr
IGNORE := posix
-CXXFLAGS := $(CXXFLAGS) -DUSE_APR -I/usr/local/apr/include
+CXXFLAGS := $(CXXFLAGS) -DUSE_APR -I$(shell apr-1-config --includedir)
LDFLAGS := $(LDFLAGS) -L/usr/local/apr/lib -lapr-1
else
PLATFORM := posix
IGNORE := apr
-LDFLAGS := $(LDFLAGS) -lpthread -lrt
+LDFLAGS := $(LDFLAGS) -lpthread -lrt -ldl
endif
## Build directories.
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRBase.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRBase.h?view=diff&rev=476303&r1=476302&r2=476303
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRBase.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRBase.h Fri Nov 17 12:30:42
2006
@@ -22,8 +22,8 @@
#define _APRBase_
#include <string>
-#include <apr-1/apr_thread_mutex.h>
-#include <apr-1/apr_errno.h>
+#include <apr_thread_mutex.h>
+#include <apr_errno.h>
namespace qpid {
namespace sys {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRPool.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRPool.h?view=diff&rev=476303&r1=476302&r2=476303
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRPool.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRPool.h Fri Nov 17 12:30:42
2006
@@ -22,7 +22,7 @@
*
*/
#include <boost/noncopyable.hpp>
-#include <apr-1/apr_pools.h>
+#include <apr_pools.h>
namespace qpid {
namespace sys {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRSocket.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRSocket.h?view=diff&rev=476303&r1=476302&r2=476303
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRSocket.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRSocket.h Fri Nov 17 12:30:42
2006
@@ -21,7 +21,7 @@
#ifndef _APRSocket_
#define _APRSocket_
-#include <apr-1/apr_network_io.h>
+#include <apr_network_io.h>
#include <qpid/framing/Buffer.h>
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/apr/LFProcessor.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/apr/LFProcessor.h?view=diff&rev=476303&r1=476302&r2=476303
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/apr/LFProcessor.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/apr/LFProcessor.h Fri Nov 17
12:30:42 2006
@@ -21,7 +21,7 @@
#ifndef _LFProcessor_
#define _LFProcessor_
-#include <apr-1/apr_poll.h>
+#include <apr_poll.h>
#include <iostream>
#include <vector>
#include <qpid/sys/Monitor.h>
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/apr/LFSessionContext.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/apr/LFSessionContext.h?view=diff&rev=476303&r1=476302&r2=476303
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/apr/LFSessionContext.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/apr/LFSessionContext.h Fri Nov 17
12:30:42 2006
@@ -23,9 +23,9 @@
#include <queue>
-#include <apr-1/apr_network_io.h>
-#include <apr-1/apr_poll.h>
-#include <apr-1/apr_time.h>
+#include <apr_network_io.h>
+#include <apr_poll.h>
+#include <apr_time.h>
#include <qpid/framing/AMQFrame.h>
#include <qpid/framing/Buffer.h>
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/posix/EpollEventChannel.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/posix/EpollEventChannel.cpp?view=diff&rev=476303&r1=476302&r2=476303
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/posix/EpollEventChannel.cpp
(original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/posix/EpollEventChannel.cpp Fri Nov
17 12:30:42 2006
@@ -35,6 +35,8 @@
epollFd = epoll_create(estimatedFdsForEpoll);
}
+EpollEventChannel::~EpollEventChannel() { }
+
void
EpollEventChannel::post(ReadEvent& /*event*/)
{
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/posix/check.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/posix/check.cpp?view=diff&rev=476303&r1=476302&r2=476303
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/posix/check.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/posix/check.cpp Fri Nov 17 12:30:42
2006
@@ -25,7 +25,7 @@
namespace qpid {
namespace sys {
-std::string strError() {
+std::string errnoToString() {
char buf[512];
return strerror_r(errno, buf, sizeof(buf));
}
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Module.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Module.h?view=diff&rev=476303&r1=476302&r2=476303
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Module.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Module.h Fri Nov 17 12:30:42 2006
@@ -28,7 +28,7 @@
namespace qpid {
namespace sys {
#if USE_APR
-#include <apr-1/apr_dso.h>
+#include <apr_dso.h>
typedef apr_dso_handle_t* dso_handle_t;
#else
typedef void* dso_handle_t;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Monitor.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Monitor.h?view=diff&rev=476303&r1=476302&r2=476303
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Monitor.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Monitor.h Fri Nov 17 12:30:42
2006
@@ -25,8 +25,8 @@
#include <boost/noncopyable.hpp>
#ifdef USE_APR
-# include <apr-1/apr_thread_mutex.h>
-# include <apr-1/apr_thread_cond.h>
+# include <apr_thread_mutex.h>
+# include <apr_thread_cond.h>
# include <qpid/apr/APRBase.h>
# include <qpid/apr/APRPool.h>
#else
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Socket.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Socket.h?view=diff&rev=476303&r1=476302&r2=476303
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Socket.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Socket.h Fri Nov 17 12:30:42 2006
@@ -25,7 +25,7 @@
#include <string>
#ifdef USE_APR
-# include <apr-1/apr_network_io.h>
+# include <apr_network_io.h>
#endif
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Thread.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Thread.h?view=diff&rev=476303&r1=476302&r2=476303
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Thread.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Thread.h Fri Nov 17 12:30:42 2006
@@ -25,8 +25,8 @@
#include <qpid/sys/Runnable.h>
#ifdef USE_APR
-# include <apr-1/apr_thread_proc.h>
-# include <apr-1/apr_portable.h>
+# include <apr_thread_proc.h>
+# include <apr_portable.h>
# include <qpid/apr/APRPool.h>
# include <qpid/apr/APRBase.h>
#else
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Time.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Time.h?view=diff&rev=476303&r1=476302&r2=476303
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Time.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Time.h Fri Nov 17 12:30:42 2006
@@ -25,7 +25,7 @@
#include <stdint.h>
#ifdef USE_APR
-# include <apr-1/apr_time.h>
+# include <apr_time.h>
#else
# include <time.h>
#endif
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/signal.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/signal.h?view=diff&rev=476303&r1=476302&r2=476303
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/signal.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/signal.h Fri Nov 17 12:30:42 2006
@@ -20,7 +20,7 @@
*/
#ifdef USE_APR
-# include <apr-1/apr_signal.h>
+# include <apr_signal.h>
#else
# include <signal.h>
#endif
