Small fixes to enable the --disable-apr-platform build to carry on compiling

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@552535 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 7 insertions, 6 deletions

diff --git a/qpid/cpp/src/qpid/Plugin.cpp b/qpid/cpp/src/qpid/Plugin.cpp
index 6389bfd73d..31fab65995 100644
--- a/qpid/cpp/src/qpid/Plugin.cpp
+++ b/qpid/cpp/src/qpid/Plugin.cpp
@@ -54,13 +54,14 @@ void dlopen(const char* name) {
 
 #else // Posix
 
+#include "qpid/sys/posix/check.h"
 #include <dlfcn.h>
 
 namespace qpid {
 void dlopen(const char* name) {
-    dlerror();
-    dlopen(name, RTLD_NOW);
-    const char* error = dlerror();
+    ::dlerror();
+    ::dlopen(name, RTLD_NOW);
+    const char* error = ::dlerror();
     if (error) {
         THROW_QPID_ERROR(INTERNAL_ERROR, error);
     }
diff --git a/qpid/cpp/src/qpid/sys/posix/Module.h b/qpid/cpp/src/qpid/sys/posix/Module.h
index a02b9d1a52..5a0358a748 100644
--- a/qpid/cpp/src/qpid/sys/posix/Module.h
+++ b/qpid/cpp/src/qpid/sys/posix/Module.h
@@ -93,9 +93,9 @@ template <class T> Module<T>::~Module() throw()
 
 template <class T> void Module<T>::load(const std::string& name)
 {
-    dlerror();
-    handle = dlopen(name.c_str(), RTLD_NOW);
-    const char* error = dlerror();
+    ::dlerror();
+    handle = ::dlopen(name.c_str(), RTLD_NOW);
+    const char* error = ::dlerror();
     if (error) {
         THROW_QPID_ERROR(INTERNAL_ERROR, error);
     }