diff options
| author | Alan Conway <aconway@apache.org> | 2006-11-17 20:30:42 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2006-11-17 20:30:42 +0000 |
| commit | d386f860a3404ec9735dab2730f8ed683446838c (patch) | |
| tree | 2980f35a6add967ab376a08fad7cdef4acff5933 /cpp/src/qpid/apr | |
| parent | bf74286e6a5eba055fd8bf9410c325205b8595d5 (diff) | |
| download | qpid-python-d386f860a3404ec9735dab2730f8ed683446838c.tar.gz | |
Patch from Andrew Stitcher to fix APR #include using apr-config.
Fixed build problems with USE_APR= - builds OK but broker non-functional.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@476303 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/apr')
| -rw-r--r-- | cpp/src/qpid/apr/APRBase.h | 4 | ||||
| -rw-r--r-- | cpp/src/qpid/apr/APRPool.h | 2 | ||||
| -rw-r--r-- | cpp/src/qpid/apr/APRSocket.h | 2 | ||||
| -rw-r--r-- | cpp/src/qpid/apr/LFProcessor.h | 2 | ||||
| -rw-r--r-- | cpp/src/qpid/apr/LFSessionContext.h | 6 |
5 files changed, 8 insertions, 8 deletions
diff --git a/cpp/src/qpid/apr/APRBase.h b/cpp/src/qpid/apr/APRBase.h index 929d421aeb..d1b3e21b91 100644 --- a/cpp/src/qpid/apr/APRBase.h +++ b/cpp/src/qpid/apr/APRBase.h @@ -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 { diff --git a/cpp/src/qpid/apr/APRPool.h b/cpp/src/qpid/apr/APRPool.h index b52db3739f..da7661fcfa 100644 --- a/cpp/src/qpid/apr/APRPool.h +++ b/cpp/src/qpid/apr/APRPool.h @@ -22,7 +22,7 @@ * */ #include <boost/noncopyable.hpp> -#include <apr-1/apr_pools.h> +#include <apr_pools.h> namespace qpid { namespace sys { diff --git a/cpp/src/qpid/apr/APRSocket.h b/cpp/src/qpid/apr/APRSocket.h index 591df2daaa..803740f97e 100644 --- a/cpp/src/qpid/apr/APRSocket.h +++ b/cpp/src/qpid/apr/APRSocket.h @@ -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 { diff --git a/cpp/src/qpid/apr/LFProcessor.h b/cpp/src/qpid/apr/LFProcessor.h index 63771f9ab6..1d1162d034 100644 --- a/cpp/src/qpid/apr/LFProcessor.h +++ b/cpp/src/qpid/apr/LFProcessor.h @@ -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> diff --git a/cpp/src/qpid/apr/LFSessionContext.h b/cpp/src/qpid/apr/LFSessionContext.h index 031aad5e5f..7060c971a5 100644 --- a/cpp/src/qpid/apr/LFSessionContext.h +++ b/cpp/src/qpid/apr/LFSessionContext.h @@ -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> |