Fix Android builds

This commit is contained in:
pancake 2017-08-19 18:52:57 +02:00
parent f571681c1a
commit 29ca827cf2
9 changed files with 9 additions and 2 deletions

View File

@ -13,4 +13,5 @@ include ../../shlr/gdb/deps.mk
include ../../shlr/java/deps.mk
include ../../shlr/bochs/deps.mk
include ../../shlr/qnx/deps.mk
include ../../shlr/ar/deps.mk
endif

View File

@ -78,3 +78,4 @@ include ../../shlr/gdb/deps.mk
include ../../shlr/java/deps.mk
include ../../shlr/bochs/deps.mk
include ../../shlr/qnx/deps.mk
include ../../shlr/ar/deps.mk

View File

@ -16,3 +16,4 @@ include ../../shlr/zip/deps.mk
include ../../shlr/gdb/deps.mk
include ../../shlr/bochs/deps.mk
include ../../shlr/qnx/deps.mk
include ../../shlr/ar/deps.mk

View File

@ -10,3 +10,4 @@ include ../../shlr/zip/deps.mk
include ../../shlr/gdb/deps.mk
include ../../shlr/bochs/deps.mk
include ../../shlr/qnx/deps.mk
include ../../shlr/ar/deps.mk

View File

@ -8,3 +8,4 @@ include ../rules.mk
include ../../libr/socket/deps.mk
include ../../shlr/bochs/deps.mk
include ../../shlr/qnx/deps.mk
include ../../shlr/ar/deps.mk

View File

@ -16,3 +16,4 @@ include ../../shlr/zip/deps.mk
include ../../shlr/gdb/deps.mk
include ../../shlr/bochs/deps.mk
include ../../shlr/qnx/deps.mk
include ../../shlr/ar/deps.mk

View File

@ -435,7 +435,7 @@ static void _print_strings(RCore *r, RList *list, int mode, int va) {
case R_STRING_TYPE_UTF8:
case R_STRING_TYPE_WIDE:
case R_STRING_TYPE_WIDE32:
block_list = r_utf_block_list (string->string);
block_list = r_utf_block_list ((const ut8*)string->string);
if (block_list) {
if (block_list[0] == 0 && block_list[1] == -1) {
/* Don't show block list if

1
shlr/ar/deps.mk Normal file
View File

@ -0,0 +1 @@
LINK+=$(STOP)/ar/libr_ar.$(EXT_AR)

View File

@ -75,7 +75,7 @@ extern "C" {
# define je_mallctlnametomib mallctlnametomib
# define je_mallctlbymib mallctlbymib
# define je_malloc_stats_print malloc_stats_print
# define je_malloc_usable_size malloc_usable_size
// # define je_malloc_usable_size malloc_usable_size
# define je_memalign memalign
# define je_valloc valloc
#endif