MonetDB: Mar2011 - loadLibrary: backout of commit 24ffad33e6ac

[Fabian Groffen]

Changeset: b1a763af91cf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b1a763af91cf
Modified Files:
        monetdb5/mal/mal_linker.mx
Branch: Mar2011
Log Message:

loadLibrary: backout of commit 24ffad33e6ac

mdlopen is used to load the running object, not an arbitrary object

This brings us back to the state were Windows can't find modules this
way.


diffs (26 lines):

diff --git a/monetdb5/mal/mal_linker.mx b/monetdb5/mal/mal_linker.mx
--- a/monetdb5/mal/mal_linker.mx
+++ b/monetdb5/mal/mal_linker.mx
@@ -261,19 +261,19 @@
                snprintf(nme, MAXPATHLEN, "%s%c%s_%s%s",
                                mod_path, DIR_SEP, SO_PREFIX, s, SO_EXT);
 #endif
-               handle = mdlopen(nme, mode);
+               handle = dlopen(nme, mode);
                /* try .so */
                if (handle == NULL && strcmp(SO_EXT, ".so") != 0) {
                        snprintf(nme, MAXPATHLEN, "%s%c%s_%s.so",
                                        mod_path, DIR_SEP, SO_PREFIX, s);
-                       handle = mdlopen(nme, mode);
+                       handle = dlopen(nme, mode);
                }
 #ifdef __APPLE__
                /* try .bundle */
                if (handle == NULL && strcmp(SO_EXT, ".bundle") != 0) {
                        snprintf(nme, MAXPATHLEN, "%s%c%s_%s.bundle",
                                        mod_path, DIR_SEP, SO_PREFIX, s);
-                       handle = mdlopen(nme, mode);
+                       handle = dlopen(nme, mode);
                }
 #endif
                if (handle != NULL) {
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list