diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2007-07-02 16:30:45 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2007-07-02 16:30:45 +0000 |
| commit | a36bef1975b1d273a65dd0e74994106fbaad4389 (patch) | |
| tree | 27ea63ec27ce8b7de7dc0aeebcaa49a42e921c7b /cpp/src | |
| parent | c7b2714b6b6ad24da21e1956163e3f143457fa7f (diff) | |
| download | qpid-python-a36bef1975b1d273a65dd0e74994106fbaad4389.tar.gz | |
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/qpid@552535 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/qpid/Plugin.cpp | 7 | ||||
| -rw-r--r-- | cpp/src/qpid/sys/posix/Module.h | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/cpp/src/qpid/Plugin.cpp b/cpp/src/qpid/Plugin.cpp index 6389bfd73d..31fab65995 100644 --- a/cpp/src/qpid/Plugin.cpp +++ b/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/cpp/src/qpid/sys/posix/Module.h b/cpp/src/qpid/sys/posix/Module.h index a02b9d1a52..5a0358a748 100644 --- a/cpp/src/qpid/sys/posix/Module.h +++ b/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); } |