37 lines
850 B
Diff
37 lines
850 B
Diff
|
diff -u -r ../zsh-5.1.1/Src/module.c ./Src/module.c
|
||
|
|
--- ../zsh-5.1.1/Src/module.c 2015-02-19 14:47:41.000000000 -0500
|
||
|
|
+++ ./Src/module.c 2015-11-24 18:38:12.383460402 -0500
|
||
|
|
@@ -1496,8 +1496,10 @@
|
||
|
|
#else
|
||
|
|
# ifdef HAVE_DL_H
|
||
|
|
# include <dl.h>
|
||
|
|
-# define RTLD_LAZY BIND_DEFERRED
|
||
|
|
-# define RTLD_GLOBAL DYNAMIC_PATH
|
||
|
|
+# ifndef __ANDROID__
|
||
|
|
+# define RTLD_LAZY BIND_DEFERRED
|
||
|
|
+# define RTLD_GLOBAL DYNAMIC_PATH
|
||
|
|
+# endif
|
||
|
|
# else
|
||
|
|
# include <sys/types.h>
|
||
|
|
# include <nlist.h>
|
||
|
|
@@ -1550,11 +1552,14 @@
|
||
|
|
/**/
|
||
|
|
#endif /* !AIXDYNAMIC */
|
||
|
|
|
||
|
|
-#ifndef RTLD_LAZY
|
||
|
|
-# define RTLD_LAZY 1
|
||
|
|
-#endif
|
||
|
|
-#ifndef RTLD_GLOBAL
|
||
|
|
-# define RTLD_GLOBAL 0
|
||
|
|
+#ifndef __ANDROID__
|
||
|
|
+/* On Android RTLD_LAZY and RTLD_LAZY are enum values so cannot ifdef check. */
|
||
|
|
+# ifndef RTLD_LAZY
|
||
|
|
+# define RTLD_LAZY 1
|
||
|
|
+# endif
|
||
|
|
+# ifndef RTLD_GLOBAL
|
||
|
|
+# define RTLD_GLOBAL 0
|
||
|
|
+# endif
|
||
|
|
#endif
|
||
|
|
|
||
|
|
/*
|