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

Update to the latest sdb and acr

Browse Source
This commit is contained in:
pancake 2022-02-25 13:30:43 +01:00
parent 83f55161d1
commit 258656a1c9
4 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -885,9 +885,9 @@ do_remove
if [ "$QUIET" = 0 ]; then
echo
echo "Final report:"
for A in R_CHECKS_LEVEL PREFIX HAVE_LIB_GMP HAVE_OPENSSL HAVE_LIBUV USE_CAPSTONE HAVE_PTRACE USE_PTRACE_WRAP HAVE_FORK USE_LIB_LZ4 VERSION USE_LIB_ZIP USE_LIB_MAGIC USE_LIB_XXHASH DEBUGGER CC USERCC HAVE_ARC4RANDOM_UNIFORM PKGCONFIG HAVE_GPERF HAVE_EXPLICIT_BZERO HAVE_EXPLICIT_MEMSET WANT_DYLINK USEROSTYPE LIBVERSION BUILD HOST TARGET CFLAGS LDFLAGS ; do
for A in BUILD CC CFLAGS DEBUGGER HAVE_ARC4RANDOM_UNIFORM HAVE_EXPLICIT_BZERO HAVE_EXPLICIT_MEMSET HAVE_FORK HAVE_GPERF HAVE_LIBUV HAVE_LIB_GMP HAVE_OPENSSL HAVE_PTRACE HOST LDFLAGS LIBVERSION PKGCONFIG PREFIX R_CHECKS_LEVEL TARGET USERCC USEROSTYPE USE_CAPSTONE USE_LIB_MAGIC USE_LIB_XXHASH USE_LIB_ZIP USE_PTRACE_WRAP USE_SYSLZ4 VERSION WANT_DYLINK ; do
eval VAL="\$${A}"
[ -z "${VAL}" ] && VAL="(null)"
[ -z "${VAL}" ] && VAL="\"\""
echo " - ${A} = ${VAL}"
done
fi

13
configure.acr
View File

@ -261,12 +261,13 @@ IFEQ WANT_PTRACE_WRAP 0 ; {
ARG_WITH R_CHECKS_LEVEL=2 checks-level value between 0 and 3 to enable different level of assert (see R_CHECKS_LEVEL) ;
REPORT R_CHECKS_LEVEL PREFIX HAVE_LIB_GMP HAVE_OPENSSL HAVE_LIBUV
USE_CAPSTONE HAVE_PTRACE USE_PTRACE_WRAP HAVE_FORK
USE_LIB_LZ4 VERSION USE_LIB_ZIP USE_LIB_MAGIC USE_LIB_XXHASH DEBUGGER
CC USERCC HAVE_ARC4RANDOM_UNIFORM PKGCONFIG HAVE_GPERF
HAVE_EXPLICIT_BZERO HAVE_EXPLICIT_MEMSET WANT_DYLINK USEROSTYPE
LIBVERSION BUILD HOST TARGET CFLAGS LDFLAGS ;
REPORT
BUILD CC CFLAGS DEBUGGER HAVE_ARC4RANDOM_UNIFORM HAVE_EXPLICIT_BZERO
HAVE_EXPLICIT_MEMSET HAVE_FORK HAVE_GPERF HAVE_LIBUV HAVE_LIB_GMP
HAVE_OPENSSL HAVE_PTRACE HOST LDFLAGS LIBVERSION PKGCONFIG PREFIX
R_CHECKS_LEVEL TARGET USERCC USEROSTYPE USE_CAPSTONE USE_LIB_MAGIC
USE_LIB_XXHASH USE_LIB_ZIP USE_PTRACE_WRAP USE_SYSLZ4 VERSION WANT_DYLINK
;
(( TODO: Add the rest of .pc files here.. add a rule for acr? ))
SUBDIRS ./config-user.mk

2
shlr/sdb/src/cdb_make.c
View File

@ -9,7 +9,7 @@
char *cdb_alloc(ut32 n) {
#if __APPLE__ && !__POWERPC__
void *ret = NULL;
return (char *)posix_memalign (&ret, ALIGNMENT, n)? NULL: ret;
return (char *)(posix_memalign (&ret, ALIGNMENT, n)? NULL: ret);
#elif __SDB_WINDOWS__ && !__CYGWIN__
return (char *)_aligned_malloc (n, ALIGNMENT);
#else

15
shlr/sdb/src/types.h
View File

@ -6,6 +6,7 @@
#include <stdlib.h>
#include <string.h>
#include <stdbool.h>
#include <stdint.h>
#include <inttypes.h>
#include <stdio.h>
@ -46,7 +47,7 @@
#include <windows.h>
#include <io.h>
#if __MINGW32__
#define ULLFMT "ll"
#define ULLFMT PRIx64
#else
#define ULLFMT "I64"
#endif
@ -60,7 +61,7 @@
#include <unistd.h>
#undef HAVE_MMAN
#define HAVE_MMAN 1
#define ULLFMT "ll"
#define ULLFMT PRIx64
#endif
#if __wasi__ || EMSCRIPTEN
@ -83,11 +84,11 @@
#endif
#ifndef ut8
#define ut8 unsigned char
#define ut32 unsigned int
#define ut64 unsigned long long
#define st64 long long
#define boolt int
#define ut8 uint8_t
#define ut32 uint32_t
#define ut64 uint64_t
#define st64 int64_t
// TODO: deprecate R_NEW
#ifndef R_NEW
//it means we are within sdb