Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-11-23 13:19:54 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix recent android build regression

Browse Source
This commit is contained in:
pancake 2021-08-19 18:26:22 +02:00
parent 50d84c4c02
commit 84e323334c
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libr/bin/p/bin_smd.c
View File

@ -153,7 +153,7 @@ static RList *symbols(RBinFile *bf) {
if (!(ret = r_list_newf (free))) {
return NULL;
}
SMD_Header hdr = {0};
SMD_Header hdr = {{0}};
int left = r_buf_read_at (bf->buf, 0x100, (ut8*)&hdr, sizeof (hdr));
if (left < sizeof (SMD_Header)) {
return NULL;

2
libr/core/vmenus.c
View File

@ -3308,7 +3308,7 @@ R_API void r_core_visual_debugtraces(RCore *core, const char *input) {
} else {
ch = r_cons_readchar ();
}
if (ch == 4 || ch == -1) {
if (ch == 4 || (int)ch == -1) {
if (level == 0) {
goto beach;
}

2
libr/debug/p/native/linux/linux_debug.c
View File

@ -1170,7 +1170,7 @@ int linux_reg_read(RDebug *dbg, int type, ut8 *buf, int size) {
.iov_base = &regs,
.iov_len = sizeof (regs)
};
ret = r_debug_ptrace (dbg, PTRACE_GETREGSET, pid, 1, &io);
ret = r_debug_ptrace (dbg, PTRACE_GETREGSET, pid, (size_t)1, &io);
// ret = ptrace (PTRACE_GETREGSET, pid, (void*)(size_t)(NT_PRSTATUS), NULL); // &io);
#elif __BSD__ && (__POWERPC__ || __sparc__)
ret = r_debug_ptrace (dbg, PTRACE_GETREGS, pid, &regs, NULL);

5
libr/include/r_types.h
View File

@ -166,11 +166,12 @@
#endif
#endif
#if EMSCRIPTEN || __wasi__ || defined(__serenity__)
#undef HAVE_PTY
#if EMSCRIPTEN || __wasi__ || defined(__serenity__)
#define HAVE_PTY 0
#else
#define HAVE_PTY __UNIX__ && !__ANDROID__ && LIBC_HAVE_FORK && !__sun
// #define HAVE_PTY __UNIX__ && !__ANDROID__ && LIBC_HAVE_FORK && !__sun
#define HAVE_PTY __UNIX__ && LIBC_HAVE_FORK && !__sun
#endif