Merge from subtype.

[cacao.git] / src / vm / os.hpp

diff --git a/src/vm/os.hpp b/src/vm/os.hpp
index 966b08fa0e72dd8eedd1d62af62c186f5f0304a6..66de93d5155630e879a91ecd66cb3e81a2b945bb 100644 (file)
--- a/src/vm/os.hpp
+++ b/src/vm/os.hpp
@@ -275,7 +275,9 @@ inline int os::dlclose(void* handle)
 inline char* os::dlerror(void)
 {
 #if defined(HAVE_DLERROR)
-       return ::dlerror();
+       // At least FreeBSD defines dlerror() to return a const char*, so
+       // we simply cast it.
+       return (char*) ::dlerror();
 #else
 # error dlerror not available
 #endif
@@ -644,9 +646,7 @@ int    os_access(const char* pathname, int mode);
 int    os_atoi(const char* nptr);
 void*  os_calloc(size_t nmemb, size_t size);
 char*  os_dirname(char* path);
-int    os_dlclose(void* handle);
 char*  os_dlerror(void);
-void*  os_dlopen(const char* filename, int flag);
 void*  os_dlsym(void* handle, const char* symbol);
 int    os_fclose(FILE* fp);
 FILE*  os_fopen(const char* path, const char* mode);