From 9dafedb7ba53736da4ad4252a26f91eb56eeafad Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Mon, 16 Oct 2006 17:36:08 +0000
Subject: Add apr-1/ prefix to APR #includes to pick up from standard location.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@464577 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/qpid/concurrent/APRBase.h          | 4 ++--
 cpp/src/qpid/concurrent/APRMonitor.h       | 4 ++--
 cpp/src/qpid/concurrent/APRThread.cpp      | 2 +-
 cpp/src/qpid/concurrent/APRThread.h        | 2 +-
 cpp/src/qpid/concurrent/APRThreadFactory.h | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'cpp/src/qpid/concurrent')

diff --git a/cpp/src/qpid/concurrent/APRBase.h b/cpp/src/qpid/concurrent/APRBase.h
index e0b526faa1..f3ff0f89c1 100644
--- a/cpp/src/qpid/concurrent/APRBase.h
+++ b/cpp/src/qpid/concurrent/APRBase.h
@@ -19,8 +19,8 @@
 #define _APRBase_
 
 #include <string>
-#include "apr_thread_mutex.h"
-#include "apr_errno.h"
+#include "apr-1/apr_thread_mutex.h"
+#include "apr-1/apr_errno.h"
 
 namespace qpid {
 namespace concurrent {
diff --git a/cpp/src/qpid/concurrent/APRMonitor.h b/cpp/src/qpid/concurrent/APRMonitor.h
index e62612b31b..a396beab50 100644
--- a/cpp/src/qpid/concurrent/APRMonitor.h
+++ b/cpp/src/qpid/concurrent/APRMonitor.h
@@ -18,8 +18,8 @@
 #ifndef _APRMonitor_
 #define _APRMonitor_
 
-#include "apr_thread_mutex.h"
-#include "apr_thread_cond.h"
+#include "apr-1/apr_thread_mutex.h"
+#include "apr-1/apr_thread_cond.h"
 #include "qpid/concurrent/Monitor.h"
 
 namespace qpid {
diff --git a/cpp/src/qpid/concurrent/APRThread.cpp b/cpp/src/qpid/concurrent/APRThread.cpp
index 6b8ceb720a..f1bfa6c7da 100644
--- a/cpp/src/qpid/concurrent/APRThread.cpp
+++ b/cpp/src/qpid/concurrent/APRThread.cpp
@@ -17,7 +17,7 @@
  */
 #include "qpid/concurrent/APRBase.h"
 #include "qpid/concurrent/APRThread.h"
-#include "apr_portable.h"
+#include "apr-1/apr_portable.h"
 
 using namespace qpid::concurrent;
 
diff --git a/cpp/src/qpid/concurrent/APRThread.h b/cpp/src/qpid/concurrent/APRThread.h
index 2ea88da49c..6d3fc0a285 100644
--- a/cpp/src/qpid/concurrent/APRThread.h
+++ b/cpp/src/qpid/concurrent/APRThread.h
@@ -18,7 +18,7 @@
 #ifndef _APRThread_
 #define _APRThread_
 
-#include "apr_thread_proc.h"
+#include "apr-1/apr_thread_proc.h"
 #include "qpid/concurrent/APRThread.h"
 #include "qpid/concurrent/Runnable.h"
 #include "qpid/concurrent/Thread.h"
diff --git a/cpp/src/qpid/concurrent/APRThreadFactory.h b/cpp/src/qpid/concurrent/APRThreadFactory.h
index 3585fab126..40e96fc2d1 100644
--- a/cpp/src/qpid/concurrent/APRThreadFactory.h
+++ b/cpp/src/qpid/concurrent/APRThreadFactory.h
@@ -18,7 +18,7 @@
 #ifndef _APRThreadFactory_
 #define _APRThreadFactory_
 
-#include "apr_thread_proc.h"
+#include "apr-1/apr_thread_proc.h"
 
 #include "qpid/concurrent/APRThread.h"
 #include "qpid/concurrent/Thread.h"
-- 
cgit v1.2.1