From 7280f14f5569ecda7bf2ab21ebe9d3446343c8b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Kochma=C5=84ski?= <daniel@turtleware.eu>
Date: Sat, 3 Oct 2015 10:19:58 +0200
Subject: [PATCH] mobile: fix compilation of android app from examples/
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Don't use C99 specific syntax for `for' loop and use functions
lib_init_* instead of main_lib_init_* which aren't exported.

Signed-off-by: Daniel Kochmański <daniel@turtleware.eu>
---
 examples/android/jni/ecl_boot.c | 18 +++++++++---------
 src/c/num_rand.d                |  6 ++++--
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/examples/android/jni/ecl_boot.c b/examples/android/jni/ecl_boot.c
index f6fcce73f..9a3ba5afa 100644
--- a/examples/android/jni/ecl_boot.c
+++ b/examples/android/jni/ecl_boot.c
@@ -23,12 +23,12 @@
 #define ECL_CPP_TAG
 #endif
 
-extern ECL_CPP_TAG void main_lib_ASDF();
-extern ECL_CPP_TAG void main_lib_SOCKETS();
-extern ECL_CPP_TAG void main_lib_SB_BSD_SOCKETS();
-extern ECL_CPP_TAG void main_lib_SERVE_EVENT();
-extern ECL_CPP_TAG void main_lib_ECL_CDB();
-extern ECL_CPP_TAG void main_lib_ECL_HELP();
+extern ECL_CPP_TAG void init_lib_ASDF();
+extern ECL_CPP_TAG void init_lib_SOCKETS();
+extern ECL_CPP_TAG void init_lib_SB_BSD_SOCKETS();
+extern ECL_CPP_TAG void init_lib_SERVE_EVENT();
+extern ECL_CPP_TAG void init_lib_ECL_CDB();
+extern ECL_CPP_TAG void init_lib_ECL_HELP();
 
 
 extern void loadLispFromAssets(char* fn);
@@ -53,9 +53,9 @@ int ecl_boot(const char *root_dir)
 
   cl_boot(1, &ecl);
 
-  main_lib_ECL_HELP();
-  main_lib_ASDF();
-  main_lib_SOCKETS();
+  init_lib_ECL_HELP();
+  init_lib_ASDF();
+  init_lib_SOCKETS();
 
   si_safe_eval(3, c_string_to_object("(format t \"ECL_BOOT, features = ~A ~%\" *features*)"), Cnil, OBJNULL);
   si_safe_eval(3, c_string_to_object("(format t \"(truename SYS:): ~A)\" (truename \"SYS:\"))"), Cnil, OBJNULL);
diff --git a/src/c/num_rand.d b/src/c/num_rand.d
index 2ec7ffe43..96b1f49f3 100644
--- a/src/c/num_rand.d
+++ b/src/c/num_rand.d
@@ -54,8 +54,9 @@ init_genrand(ulong seed)
 {
         cl_object array = ecl_alloc_simple_vector((MT_N + 1), ecl_aet_b64);
         ulong *mt = array->vector.self.b64;
+        int j;
         mt[0] = seed;
-        for (int j=1; j<MT_N; j++) 
+        for (j=1; j<MT_N; j++)
                 mt[j] =  (6364136223846793005ULL * (mt[j-1] ^ (mt[j-1] >> 62)) + j);
 
         mt[MT_N] = MT_N+1;
@@ -135,8 +136,9 @@ init_genrand(ulong seed)
 {
         cl_object array = ecl_alloc_simple_vector((MT_N + 1), ecl_aet_b32);
         ulong *mt = array->vector.self.b32;
+        int j;
         mt[0] = seed;
-        for (int j=1; j < MT_N; j++)
+        for (j=1; j < MT_N; j++)
                 mt[j] = (1812433253UL * (mt[j-1] ^ (mt[j-1] >> 30)) + j);
 
         mt[MT_N] = MT_N+1;