From a23759673680a5e28f1ebce18f51a0126e26c81f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= <vsc@dcc.fc.up.pt>
Date: Wed, 3 Apr 2019 17:08:12 +0100
Subject: [PATCH] fixes

---
 C/errors.c     | 2 +-
 CMakeLists.txt | 2 +-
 CXX/yapq.hh    | 2 +-
 os/streams.c   | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/C/errors.c b/C/errors.c
index 34b4512c2..791113072 100755
--- a/C/errors.c
+++ b/C/errors.c
@@ -337,7 +337,7 @@ bool Yap_PrintWarning(Term twarning) {
       FunctorPrintMessage, PROLOG_MODULE)); // PROCEDURE_print_message2;
   if (twarning)
     __android_log_print(ANDROID_LOG_INFO, "YAPDroid ", " warning(%s)",
-                        Yap_TermToBuffer(twarning, Quote_illegal_f | Ignore_ops_f | Ignore_cyclics_f));
+                        Yap_TermToBuffer(twarning, Quote_illegal_f | Ignore_ops_f | Handle_cyclics_f));
   Term cmod = (CurrentModule == PROLOG_MODULE ? TermProlog : CurrentModule);
   bool rc;
   Term ts[2], err;
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d7fbeed1..45fb287c7 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -616,7 +616,7 @@ add_subDIRECTORY(utf8proc )
        set(CXX_SWIG_OUTDIR ${CMAKE_BINARY_DIR}/packages/swig/android)
        add_subdirectory(packages/swig/android)
        add_definitions(-DMYDDAS=1 -DEMBEDDED_MYDDAS=1 -DMYDDAS_SQLITE3=1 -DEMBEDDED_SQLITE3=1)
-       link_directories(${CMAKE_SOURCE_DIR}/../sqlite-android/jni/${CMAKE_ANDROID_ARCH_ABI})
+       link_directories(${CMAKE_SOURCE_DIR}/../sqlite-android/jni/${ANDROID_ABI})
 
    else()
        add_definitions(-DMYDDAS=1 -DEMBEDDED_MYDDAS=1 -DMYDDAS_SQLITE3=1 )
diff --git a/CXX/yapq.hh b/CXX/yapq.hh
index 35474603b..5296a6dcc 100644
--- a/CXX/yapq.hh
+++ b/CXX/yapq.hh
@@ -94,7 +94,7 @@ public:
   /// should be a callable
   /// goal.
   inline YAPQuery(const char *s) : YAPPredicate(s, goal, names, (nts = &ARG1)) {
-    __android_log_print(ANDROID_LOG_INFO, "YAPDroid", "got game %d",
+    __android_log_print(ANDROID_LOG_INFO, "YAPDroid", "got game %ld",
                         LOCAL_CurSlot);
 
     openQuery();
diff --git a/os/streams.c b/os/streams.c
index 051d9d7c1..60120570a 100644
--- a/os/streams.c
+++ b/os/streams.c
@@ -131,7 +131,6 @@ FILE *Yap_GetOutputStream(Term t, const char *msg) {
   return rc;
 }
 
-cmax =7;
 int GetFreeStreamD(void) {
   CACHE_REGS
   LOCK(GLOBAL_StreamDescLock);