From 8380592eddec548cf70bc63cd43be886ea68a57f Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Mon, 2 Jul 2007 16:30:45 +0000 Subject: 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 --- qpid/cpp/src/qpid/Plugin.cpp | 7 ++++--- qpid/cpp/src/qpid/sys/posix/Module.h | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'qpid/cpp/src') 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 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 Module::~Module() throw() template void Module::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); } -- cgit v1.2.1