summaryrefslogtreecommitdiff
authorPekka Paalanen <ppaalanen@gmail.com>2012-09-18 10:51:53 (GMT)
committer Pekka Paalanen <ppaalanen@gmail.com>2012-09-18 10:51:53 (GMT)
commit1e2454c9ef247653e5ffc4b759d26db1bdd4a592 (patch) (side-by-side diff)
treeab1f737739cb7c92a20061f2c75e34e9824ecb55
parent57bb3c287ee36481d098b9aa1f5aab366eeaa4ed (diff)
downloadweston-master.tar.gz
weston-master.tar.bz2
compositor: android does not have RTLD_NOLOADHEADmaster
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/compositor.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/compositor.c b/src/compositor.c
index b5d192a..e77da0a 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -2868,12 +2868,14 @@ load_module(const char *name, const char *entrypoint)
else
snprintf(path, sizeof path, "%s", name);
+#ifndef ANDROID
module = dlopen(path, RTLD_NOW | RTLD_NOLOAD);
if (module) {
weston_log("Module '%s' already loaded\n", path);
dlclose(module);
return NULL;
}
+#endif
weston_log("Loading module '%s'\n", path);
module = dlopen(path, RTLD_NOW);