From b527ebbf5be0949df3b9dcf0806109acc8119476 Mon Sep 17 00:00:00 2001 From: rajdakin Date: Sat, 10 Feb 2024 15:06:08 +0100 Subject: Wrapped libraries refactor (#1257) * [MISC] Removed a warning caused by tab/space mismatch * [WRAPPED] Factored out `getMy` and `freeMy` calls * [WRAPPED] Small cleanup of the init header * [WRAPPED] Factored out `SETALT` * [WRAPPED] Factored out needed libs --- src/wrapped/wrappedlibc.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/wrapped/wrappedlibc.c') diff --git a/src/wrapped/wrappedlibc.c b/src/wrapped/wrappedlibc.c index 428946b9..1c7c5a25 100644 --- a/src/wrapped/wrappedlibc.c +++ b/src/wrapped/wrappedlibc.c @@ -3454,7 +3454,7 @@ EXPORT char my___libc_single_threaded = 0; else #ifdef ANDROID -#define NEEDED_LIBS 1, \ +#define NEEDED_LIBS_DEF 1,\ "libbsd.so" #define NEEDED_LIBS_234 4, \ "libpthread.so.0", \ @@ -3462,7 +3462,7 @@ EXPORT char my___libc_single_threaded = 0; "libm.so", \ "libbsd.so" #else -#define NEEDED_LIBS 6, \ +#define NEEDED_LIBS_DEF 6,\ "ld-linux-x86-64.so.2", \ "libpthread.so.0", \ "libdl.so.2", \ @@ -3479,6 +3479,8 @@ EXPORT char my___libc_single_threaded = 0; "libbsd.so.0" #endif +#undef HAS_MY + #define CUSTOM_INIT \ box64->libclib = lib; \ /*InitCpuModel();*/ \ @@ -3492,7 +3494,7 @@ EXPORT char my___libc_single_threaded = 0; if(box64_isglibc234) \ setNeededLibs(lib, NEEDED_LIBS_234); \ else \ - setNeededLibs(lib, NEEDED_LIBS); + setNeededLibs(lib, NEEDED_LIBS_DEF); #define CUSTOM_FINI \ freeMy(); \ -- cgit 1.4.1