svn commit: r552535 - in /incubator/qpid/trunk/qpid/cpp/src/qpid: Plugin.cpp sys/posix/Module.h

[astitcher]

Author: astitcher
Date: Mon Jul  2 09:30:45 2007
New Revision: 552535

URL: http://svn.apache.org/viewvc?view=rev&rev=552535
Log:
Small fixes to enable the --disable-apr-platform build to carry on compiling

Modified:
    incubator/qpid/trunk/qpid/cpp/src/qpid/Plugin.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/Module.h

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/Plugin.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/Plugin.cpp?view=diff&rev=552535&r1=552534&r2=552535
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/Plugin.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/Plugin.cpp Mon Jul  2 09:30:45 2007
@@ -54,13 +54,14 @@
 
 #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);
     }

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/Module.h
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/Module.h?view=diff&rev=552535&r1=552534&r2=552535
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/Module.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/Module.h Mon Jul  2 
09:30:45 2007
@@ -93,9 +93,9 @@
 
 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);
     }