Shared library working on Windows

Signed-off-by: ahcorde <ahcorde@gmail.com> Signed-off-by: Alejandro Hernández <ahcorde@gmail.com>
ros2 · Mar 10, 2020 · 5bcd3b4 · 5bcd3b4
1 parent 0e69e81
commit 5bcd3b4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/include/rcutils/shared_library.h b/include/rcutils/shared_library.h
@@ -22,6 +22,12 @@ extern "C"
 
 #include <string.h>
 
+#ifndef _WIN32
+#include <dlfcn.h>
+#else
+#include <windows.h>
+#endif  // _WIN32
+
 #include "rcutils/macros.h"
 #include "rcutils/visibility_control.h"
 
@@ -32,7 +38,7 @@ typedef struct rcutils_shared_library_t
   #ifndef _WIN32
   void * lib_pointer;
   #else
-  HINSTANCE lib;
+  HINSTANCE lib_pointer;
   #endif
   /// The path of the shared_library
   char * library_path;

diff --git a/src/shared_library.c b/src/shared_library.c
@@ -20,11 +20,6 @@ extern "C"
 
 #include <stdio.h>
 #include <stdlib.h>
-#ifndef _WIN32
-#include <dlfcn.h>
-#else
-#include <windows.h>
-#endif  // _WIN32
 
 rcutils_shared_library_t *
 rcutils_get_shared_library(const char * library_path)
@@ -35,7 +30,7 @@ rcutils_get_shared_library(const char * library_path)
 #ifndef _WIN32
   lib->lib_pointer = dlopen(library_path, RTLD_LAZY);
 #else
-  lib->lib_pointer = LoadLibrary(library_path.c_str());
+  lib->lib_pointer = LoadLibrary(library_path);
 #endif  // _WIN32
   if (!lib->lib_pointer) {
     free(lib);