android: activate the GC

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>

diff --git a/clib/gc_chooser.c b/clib/gc_chooser.c
index 5cf3065..3a37da5 100644 (file)
--- a/clib/gc_chooser.c
+++ b/clib/gc_chooser.c
@@ -18,9 +18,6 @@
 #ifdef ANDROID
        #include <android/log.h>
        #define PRINT_ERROR(...) ((void)__android_log_print(ANDROID_LOG_WARN, "nit", __VA_ARGS__))
-
-       // FIXME bring back when the GC is fixed in Android
-       #undef WITH_LIBGC
 #else
        #define PRINT_ERROR(...) ((void)fprintf(stderr, __VA_ARGS__))
 #endif
@@ -28,7 +25,7 @@
 enum gc_option { gc_opt_large, gc_opt_malloc, gc_opt_boehm } gc_option;
 
 #ifdef WITH_LIBGC
-#include <gc/gc.h>
+       #include <gc.h>
 #endif
 
 void *nit_raw_alloc(size_t s0)

diff --git a/lib/pthreads/pthreads.nit b/lib/pthreads/pthreads.nit
index 585005b..3a6dc7b 100644 (file)
--- a/lib/pthreads/pthreads.nit
+++ b/lib/pthreads/pthreads.nit
@@ -45,7 +45,7 @@ in "C" `{
                #endif
        #endif
 
-       #if !defined(__ANDROID__) && !defined(IOS)
+       #if !defined(IOS)
                #define GC_THREADS
                #include <gc.h>
        #endif