android and python updates

C/scanner.c

@@ -1119,7 +1119,11 @@ Term Yap_scan_num(StreamDesc *inp) {
     LOCAL_Error_TYPE = RESOURCE_ERROR_TRAIL;
     return 0;
   }
+#if HAVE_ISWBLANK
   while (iswblank(   ch = getchr(inp) ));
+#else
+  while (isspace(   ch = getchr(inp) ));
+#endif
   TokEntry *tokptr = (TokEntry *)AllocScannerMemory(sizeof(TokEntry));
   tokptr->TokPos = GetCurInpPos(inp);
   if (ch == '-') {

C/text.c

@@ -888,7 +888,8 @@ static unsigned char *concat(int n, unsigned char *sv[] USES_REGS) {
     buf = Malloc(room + 1);
     buf0 = (unsigned char *) buf;
     for (i = 0; i < n; i++) {
-        buf = stpcpy(buf, (char *) sv[i]);
+        buf = strcpy(buf, (char *) sv[i]);
+        buf += strlen( sv[i] );
     }
     return buf0;
 }