Remove the return type for Utility::LoadExtensionLibrary

diff --git a/lib/base/utility.cpp b/lib/base/utility.cpp
index cd25f988c4746fe0d4eb4cc865712a861c762d25..543a65bb64af3916f1bbf9d91fbb1bc7d5fd779e 100644 (file)
--- a/lib/base/utility.cpp
+++ b/lib/base/utility.cpp
@@ -299,12 +299,7 @@ void Utility::Sleep(double timeout)
  *
  * @param library The name of the library.
  */
-#ifdef _WIN32
-HMODULE
-#else /* _WIN32 */
-void *
-#endif /* _WIN32 */
-Utility::LoadExtensionLibrary(const String& library)
+void Utility::LoadExtensionLibrary(const String& library)
 {
        String path;
 #if defined(_WIN32)
@@ -336,9 +331,6 @@ Utility::LoadExtensionLibrary(const String& library)
 #endif /* _WIN32 */
 
        ExecuteDeferredInitializers();
-
-
-       return hModule;
 }
 
 boost::thread_specific_ptr<std::vector<boost::function<void(void)> > >& Utility::GetDeferredInitializers(void)
@@ -1255,4 +1247,4 @@ String Utility::UnescapeString(const String& s)
        }
 
        return result.str();
-}
\ No newline at end of file
+}

diff --git a/lib/base/utility.hpp b/lib/base/utility.hpp
index 6409d698eea955589a1a35971187394510cd3fe6..c1702193e6934b831ad3341f78147cfb2a4343ce 100644 (file)
--- a/lib/base/utility.hpp
+++ b/lib/base/utility.hpp
@@ -94,13 +94,7 @@ public:
        static String FormatDateTime(const char *format, double ts);
        static String FormatErrorNumber(int code);
 
-       static
-#ifdef _WIN32
-       HMODULE
-#else /* _WIN32 */
-       void *
-#endif /* _WIN32 */
-       LoadExtensionLibrary(const String& library);
+       static void LoadExtensionLibrary(const String& library);
 
        static void AddDeferredInitializer(const boost::function<void(void)>& callback);
        static void ExecuteDeferredInitializers(void);

diff --git a/lib/cli/daemoncommand.cpp b/lib/cli/daemoncommand.cpp
index 4d564b94a8cc388e2176401e45520891588609bb..503c83a89cc3e95217fa6bf76805779be5230d3f 100644 (file)
--- a/lib/cli/daemoncommand.cpp
+++ b/lib/cli/daemoncommand.cpp
@@ -55,7 +55,7 @@ static String LoadAppType(const String& typeSpec)
 
        String library = typeSpec.SubStr(0, index);
 
-       (void) Utility::LoadExtensionLibrary(library);
+       Utility::LoadExtensionLibrary(library);
 
        return typeSpec.SubStr(index + 1);
 }

diff --git a/lib/config/configcompiler.cpp b/lib/config/configcompiler.cpp
index 1ad8fa46e63c9f3af60300b5a26726a22f32dbfd..4eb5766ed9df000316d2d5008e440c14dbcccc10 100644 (file)
--- a/lib/config/configcompiler.cpp
+++ b/lib/config/configcompiler.cpp
@@ -171,7 +171,7 @@ Expression *ConfigCompiler::HandleIncludeRecursive(const String& path, const Str
  */
 void ConfigCompiler::HandleLibrary(const String& library)
 {
-       (void) Utility::LoadExtensionLibrary(library);
+       Utility::LoadExtensionLibrary(library);
 }
 
 void ConfigCompiler::CompileHelper(void)