From 29ca827cf273dbc2ec84807fb50350939d12b0d2 Mon Sep 17 00:00:00 2001 From: pancake Date: Sat, 19 Aug 2017 18:52:57 +0200 Subject: [PATCH] Fix Android builds --- binr/rabin2/Makefile | 1 + binr/radare2/Makefile | 1 + binr/radiff2/Makefile | 1 + binr/rafind2/Makefile | 1 + binr/ragg2/Makefile | 1 + binr/rahash2/Makefile | 1 + libr/core/cbin.c | 2 +- shlr/ar/deps.mk | 1 + shlr/heap/include/r_jemalloc/jemalloc.h | 2 +- 9 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 shlr/ar/deps.mk diff --git a/binr/rabin2/Makefile b/binr/rabin2/Makefile index bdb5a85b19..71ea0565c8 100644 --- a/binr/rabin2/Makefile +++ b/binr/rabin2/Makefile @@ -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 diff --git a/binr/radare2/Makefile b/binr/radare2/Makefile index 4c5815e449..c83d186f81 100644 --- a/binr/radare2/Makefile +++ b/binr/radare2/Makefile @@ -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 diff --git a/binr/radiff2/Makefile b/binr/radiff2/Makefile index dfe9ee14b2..d5a5e6276a 100644 --- a/binr/radiff2/Makefile +++ b/binr/radiff2/Makefile @@ -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 diff --git a/binr/rafind2/Makefile b/binr/rafind2/Makefile index 785be8d3a5..0ec96a58e0 100644 --- a/binr/rafind2/Makefile +++ b/binr/rafind2/Makefile @@ -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 diff --git a/binr/ragg2/Makefile b/binr/ragg2/Makefile index d5cd83d9d4..d635505b57 100644 --- a/binr/ragg2/Makefile +++ b/binr/ragg2/Makefile @@ -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 diff --git a/binr/rahash2/Makefile b/binr/rahash2/Makefile index a0649318be..9ed92199d9 100644 --- a/binr/rahash2/Makefile +++ b/binr/rahash2/Makefile @@ -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 diff --git a/libr/core/cbin.c b/libr/core/cbin.c index c99a2277ec..8de7ced068 100644 --- a/libr/core/cbin.c +++ b/libr/core/cbin.c @@ -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 diff --git a/shlr/ar/deps.mk b/shlr/ar/deps.mk new file mode 100644 index 0000000000..4a33b0b9fb --- /dev/null +++ b/shlr/ar/deps.mk @@ -0,0 +1 @@ +LINK+=$(STOP)/ar/libr_ar.$(EXT_AR) diff --git a/shlr/heap/include/r_jemalloc/jemalloc.h b/shlr/heap/include/r_jemalloc/jemalloc.h index 4d02756da2..b4d3d3f9fe 100644 --- a/shlr/heap/include/r_jemalloc/jemalloc.h +++ b/shlr/heap/include/r_jemalloc/jemalloc.h @@ -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