--- a/dynload/dynload_unix.c	Thu May 04 13:54:29 2017 +0200
+++ b/dynload/dynload_unix.c	Thu May 04 15:11:46 2017 +0200
@@ -89,12 +89,10 @@
   for(i=_dyld_image_count(); i>0;) /* iterate libs from end, more likely ours */
   {
     const char* libPath = _dyld_get_image_name(--i);
-    void* lib = dlopen(libPath, RTLD_LAZY);
+    DLLib* lib = dlLoadLibrary(libPath); /* re-open same way for same handle */
     if(lib) {
-      dlclose(lib);
-      /* compare handle pointers' high bits (in low 2 bits some flags might */
-      /* be stored - should be safe b/c address needs alignment, anywas) */
-      if(((intptr_t)pLib ^ (intptr_t)lib) < 4) {
+      dlFreeLibrary(lib);
+      if(pLib == lib) {
         l = strlen(libPath);
         if(l < bufSize) /* l+'\0' <= bufSize */
           strcpy(sOut, libPath);
@@ -128,10 +126,10 @@
   /* unable to relate info->dlpi_addr directly to our dlopen handle, let's */
   /* do what we do on macOS above, re-dlopen the already loaded lib (just  */
   /* increases ref count) and compare handles. */
-  void* lib = dlopen(info->dlpi_name, RTLD_LAZY);
+  DLLib* lib = dlLoadLibrary(info->dlpi_name); /* re-open same way for same handle */
   if(lib) {
-    dlclose(lib);
-    if(lib == (void*)d->pLib) {
+    dlFreeLibrary(lib);
+    if(lib == d->pLib) {
       l = strlen(info->dlpi_name);
       if(l < d->bufSize) /* l+'\0' <= bufSize */
         strcpy(d->sOut, info->dlpi_name);