MonetDB: mbedded - only use mdlopen on APPLEs

[Niels Nes]

Changeset: 41b3063264a2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=41b3063264a2
Modified Files:
        monetdb5/mal/mal_linker.c
Branch: mbedded
Log Message:

only use mdlopen on APPLEs


diffs (27 lines):

diff --git a/monetdb5/mal/mal_linker.c b/monetdb5/mal/mal_linker.c
--- a/monetdb5/mal/mal_linker.c
+++ b/monetdb5/mal/mal_linker.c
@@ -103,7 +103,11 @@ getAddress(str fcnname)
         *
         * the first argument must be the same as the base name of the
         * library that is created in src/tools */
+#ifdef __APPLE__
        dl = mdlopen(SO_PREFIX "monetdb5" SO_EXT, RTLD_NOW | RTLD_GLOBAL);
+#else
+       dl = dlopen(SO_PREFIX "monetdb5" SO_EXT, RTLD_NOW | RTLD_GLOBAL);
+#endif
        if (dl == NULL) 
                return NULL;
 
@@ -179,7 +183,11 @@ loadLibrary(str filename, int flag)
                if (len == -1 || len >= FILENAME_MAX)
                        throw(LOADER, "loadLibrary", RUNTIME_LOAD_ERROR 
"Library filename path is too large");
 
+#ifdef __APPLE__
                handle = mdlopen(nme, RTLD_NOW | RTLD_GLOBAL);
+#else
+               handle = dlopen(nme, RTLD_NOW | RTLD_GLOBAL);
+#endif
                if (!handle) {
                        if (flag)
                                throw(LOADER, "loadLibrary", 
RUNTIME_FILE_NOT_FOUND ":%s", s);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list