MonetDB: Mar2011 - merge with new remote changes on Mar2011 branch

[Stefan Manegold]

Changeset: 970a2994b23a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=970a2994b23a
Modified Files:
        
Branch: Mar2011
Log Message:

merge with new remote changes on Mar2011 branch


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 = dlopen(nme, mode);
+               handle = mdlopen(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 = dlopen(nme, mode);
+                       handle = mdlopen(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 = dlopen(nme, mode);
+                       handle = mdlopen(nme, mode);
                }
 #endif
                if (handle != NULL) {
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list