Alexandre Julliard : loader: The preloader is not supported on Android, don't try to use it.

Alexandre Julliard julliard at winehq.org
Thu Jul 21 09:58:53 CDT 2016


Module: wine
Branch: master
Commit: c2d7bda87f5e0972c007b4d9639793fe67a5c32e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c2d7bda87f5e0972c007b4d9639793fe67a5c32e

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Jul 21 12:29:08 2016 +0900

loader: The preloader is not supported on Android, don't try to use it.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 loader/main.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/loader/main.c b/loader/main.c
index bb752b5..05e0c06 100644
--- a/loader/main.c
+++ b/loader/main.c
@@ -109,7 +109,14 @@ static void check_command_line( int argc, char *argv[] )
 }
 
 
-#if defined(__linux__) && (defined(__i386__) || defined(__arm__))
+#ifdef __ANDROID__
+
+static int pre_exec(void)
+{
+    return 0;  /* no exec needed */
+}
+
+#elif defined(__linux__) && (defined(__i386__) || defined(__arm__))
 
 #ifdef __i386__
 /* separate thread to check for NPTL and TLS features */




More information about the wine-cvs mailing list