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/sys | |
| 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/sys')
| -rw-r--r-- | cpp/src/qpid/sys/Module.h | 2 | ||||
| -rw-r--r-- | cpp/src/qpid/sys/Monitor.h | 4 | ||||
| -rw-r--r-- | cpp/src/qpid/sys/Socket.h | 2 | ||||
| -rw-r--r-- | cpp/src/qpid/sys/Thread.h | 4 | ||||
| -rw-r--r-- | cpp/src/qpid/sys/Time.h | 2 | ||||
| -rw-r--r-- | cpp/src/qpid/sys/signal.h | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/cpp/src/qpid/sys/Module.h b/cpp/src/qpid/sys/Module.h index 3093eef074..db791666e0 100644 --- a/cpp/src/qpid/sys/Module.h +++ b/cpp/src/qpid/sys/Module.h @@ -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; diff --git a/cpp/src/qpid/sys/Monitor.h b/cpp/src/qpid/sys/Monitor.h index a3abe37748..59e1e74b57 100644 --- a/cpp/src/qpid/sys/Monitor.h +++ b/cpp/src/qpid/sys/Monitor.h @@ -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 diff --git a/cpp/src/qpid/sys/Socket.h b/cpp/src/qpid/sys/Socket.h index 0b898bb999..cf757e7a27 100644 --- a/cpp/src/qpid/sys/Socket.h +++ b/cpp/src/qpid/sys/Socket.h @@ -25,7 +25,7 @@ #include <string> #ifdef USE_APR -# include <apr-1/apr_network_io.h> +# include <apr_network_io.h> #endif namespace qpid { diff --git a/cpp/src/qpid/sys/Thread.h b/cpp/src/qpid/sys/Thread.h index 79dfc184e0..2aad7c24d7 100644 --- a/cpp/src/qpid/sys/Thread.h +++ b/cpp/src/qpid/sys/Thread.h @@ -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 diff --git a/cpp/src/qpid/sys/Time.h b/cpp/src/qpid/sys/Time.h index 7fa2f2d8e7..a569c90780 100644 --- a/cpp/src/qpid/sys/Time.h +++ b/cpp/src/qpid/sys/Time.h @@ -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 diff --git a/cpp/src/qpid/sys/signal.h b/cpp/src/qpid/sys/signal.h index 6cae2b9e4a..b7cfc8a950 100644 --- a/cpp/src/qpid/sys/signal.h +++ b/cpp/src/qpid/sys/signal.h @@ -20,7 +20,7 @@ */ #ifdef USE_APR -# include <apr-1/apr_signal.h> +# include <apr_signal.h> #else # include <signal.h> #endif |