diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/dl/dl.h | 2 | ||||
| -rw-r--r-- | ext/dl/handle.c | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/ext/dl/dl.h b/ext/dl/dl.h index 753bd1c976..fb904bc561 100644 --- a/ext/dl/dl.h +++ b/ext/dl/dl.h @@ -24,7 +24,7 @@ # include <windows.h> # define dlclose(ptr) FreeLibrary((HINSTANCE)ptr) # define dlopen(name,flag) ((void*)LoadLibrary(name)) -# define dlerror() "unknown error" +# define dlerror() strerror(rb_w32_map_errno(GetLastError())) # define dlsym(handle,name) ((void*)GetProcAddress(handle,name)) # define RTLD_LAZY -1 # define RTLD_NOW -1 diff --git a/ext/dl/handle.c b/ext/dl/handle.c index b8752004bc..c4ee0b9c14 100644 --- a/ext/dl/handle.c +++ b/ext/dl/handle.c @@ -67,6 +67,13 @@ rb_dlhandle_initialize(int argc, VALUE argv[], VALUE self) rb_bug("rb_dlhandle_new"); } +#if defined(HAVE_WINDOWS_H) + if( !clib ){ + HANDLE rb_libruby_handle(void); + ptr = rb_libruby_handle(); + } + else +#endif ptr = dlopen(clib, cflag); #if defined(HAVE_DLERROR) if( !ptr && (err = dlerror()) ){ |