sfos/ecl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mobile: fix compilation of android app from examples/

Browse source 
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>
This commit is contained in:
Daniel Kochmański 2015-10-03 10:19:58 +02:00
parent 641a12b4e1
commit 7280f14f55
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
examples/android/jni/ecl_boot.c
View file

@ -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);

6
src/c/num_rand.d
View file

@ -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;