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/broker/Queue.h                 | 2 +-
 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 +-
 cpp/src/qpid/io/APRConnector.h              | 4 ++--
 cpp/src/qpid/io/APRSocket.h                 | 2 +-
 cpp/src/qpid/io/BlockingAPRAcceptor.h       | 6 +++---
 cpp/src/qpid/io/BlockingAPRSessionContext.h | 4 ++--
 cpp/src/qpid/io/LFAcceptor.h                | 6 +++---
 cpp/src/qpid/io/LFProcessor.h               | 2 +-
 cpp/src/qpid/io/LFSessionContext.h          | 6 +++---
 cpp/src/qpidd.cpp                           | 2 +-
 14 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'cpp/src')

diff --git a/cpp/src/qpid/broker/Queue.h b/cpp/src/qpid/broker/Queue.h
index d3cd29989d..8d3e4ab93b 100644
--- a/cpp/src/qpid/broker/Queue.h
+++ b/cpp/src/qpid/broker/Queue.h
@@ -21,7 +21,7 @@
 #include <vector>
 #include <queue>
 #include "memory.h"
-#include "apr_time.h"
+#include "apr-1/apr_time.h"
 #include "qpid/framing/amqp_types.h"
 #include "qpid/broker/Binding.h"
 #include "qpid/broker/ConnectionToken.h"
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"
diff --git a/cpp/src/qpid/io/APRConnector.h b/cpp/src/qpid/io/APRConnector.h
index e097fc27eb..c835f30056 100644
--- a/cpp/src/qpid/io/APRConnector.h
+++ b/cpp/src/qpid/io/APRConnector.h
@@ -18,8 +18,8 @@
 #ifndef _APRConnector_
 #define _APRConnector_
 
-#include "apr_network_io.h"
-#include "apr_time.h"
+#include "apr-1/apr_network_io.h"
+#include "apr-1/apr_time.h"
 
 #include "qpid/framing/InputHandler.h"
 #include "qpid/framing/OutputHandler.h"
diff --git a/cpp/src/qpid/io/APRSocket.h b/cpp/src/qpid/io/APRSocket.h
index 742f958b8a..0b6644dfb6 100644
--- a/cpp/src/qpid/io/APRSocket.h
+++ b/cpp/src/qpid/io/APRSocket.h
@@ -18,7 +18,7 @@
 #ifndef _APRSocket_
 #define _APRSocket_
 
-#include "apr_network_io.h"
+#include "apr-1/apr_network_io.h"
 #include "qpid/framing/Buffer.h"
 
 namespace qpid {
diff --git a/cpp/src/qpid/io/BlockingAPRAcceptor.h b/cpp/src/qpid/io/BlockingAPRAcceptor.h
index 8c83c726c9..a3042605aa 100644
--- a/cpp/src/qpid/io/BlockingAPRAcceptor.h
+++ b/cpp/src/qpid/io/BlockingAPRAcceptor.h
@@ -19,9 +19,9 @@
 #define _BlockingAPRAcceptor_
 
 #include <vector>
-#include "apr_network_io.h"
-#include "apr_poll.h"
-#include "apr_time.h"
+#include "apr-1/apr_network_io.h"
+#include "apr-1/apr_poll.h"
+#include "apr-1/apr_time.h"
 
 #include "qpid/io/Acceptor.h"
 #include "qpid/concurrent/APRMonitor.h"
diff --git a/cpp/src/qpid/io/BlockingAPRSessionContext.h b/cpp/src/qpid/io/BlockingAPRSessionContext.h
index 006b73b55c..c06142ace5 100644
--- a/cpp/src/qpid/io/BlockingAPRSessionContext.h
+++ b/cpp/src/qpid/io/BlockingAPRSessionContext.h
@@ -21,8 +21,8 @@
 #include <queue>
 #include <vector>
 
-#include "apr_network_io.h"
-#include "apr_time.h"
+#include "apr-1/apr_network_io.h"
+#include "apr-1/apr_time.h"
 
 #include "qpid/framing/AMQFrame.h"
 #include "qpid/concurrent/APRMonitor.h"
diff --git a/cpp/src/qpid/io/LFAcceptor.h b/cpp/src/qpid/io/LFAcceptor.h
index f31b544143..35a556d500 100644
--- a/cpp/src/qpid/io/LFAcceptor.h
+++ b/cpp/src/qpid/io/LFAcceptor.h
@@ -19,9 +19,9 @@
 #define _LFAcceptor_
 
 #include <vector>
-#include "apr_network_io.h"
-#include "apr_poll.h"
-#include "apr_time.h"
+#include "apr-1/apr_network_io.h"
+#include "apr-1/apr_poll.h"
+#include "apr-1/apr_time.h"
 
 #include "qpid/io/Acceptor.h"
 #include "qpid/concurrent/APRMonitor.h"
diff --git a/cpp/src/qpid/io/LFProcessor.h b/cpp/src/qpid/io/LFProcessor.h
index e3f533d597..16c789f0ff 100644
--- a/cpp/src/qpid/io/LFProcessor.h
+++ b/cpp/src/qpid/io/LFProcessor.h
@@ -18,7 +18,7 @@
 #ifndef _LFProcessor_
 #define _LFProcessor_
 
-#include "apr_poll.h"
+#include "apr-1/apr_poll.h"
 #include <iostream>
 #include <vector>
 #include "qpid/concurrent/APRMonitor.h"
diff --git a/cpp/src/qpid/io/LFSessionContext.h b/cpp/src/qpid/io/LFSessionContext.h
index fad8736796..9406bb97b6 100644
--- a/cpp/src/qpid/io/LFSessionContext.h
+++ b/cpp/src/qpid/io/LFSessionContext.h
@@ -20,9 +20,9 @@
 
 #include <queue>
 
-#include "apr_network_io.h"
-#include "apr_poll.h"
-#include "apr_time.h"
+#include "apr-1/apr_network_io.h"
+#include "apr-1/apr_poll.h"
+#include "apr-1/apr_time.h"
 
 #include "qpid/framing/AMQFrame.h"
 #include "qpid/concurrent/APRMonitor.h"
diff --git a/cpp/src/qpidd.cpp b/cpp/src/qpidd.cpp
index 85d337dd93..293380d46d 100644
--- a/cpp/src/qpidd.cpp
+++ b/cpp/src/qpidd.cpp
@@ -17,7 +17,7 @@
  */
 #include "qpid/broker/Broker.h"
 #include "qpid/broker/Configuration.h"
-#include "apr_signal.h"
+#include "apr-1/apr_signal.h"
 #include <iostream>
 #include <memory>
 
-- 
cgit v1.2.1