about summary refs log tree commit diff stats
path: root/src/wrapped/wrappedlibxext.c
diff options
context:
space:
mode:
authorrajdakin <rajdakin@gmail.com>2024-02-10 15:06:08 +0100
committerGitHub <noreply@github.com>2024-02-10 15:06:08 +0100
commitb527ebbf5be0949df3b9dcf0806109acc8119476 (patch)
treed9687f665b8e3a1facc15be822463bf7d274dacd /src/wrapped/wrappedlibxext.c
parentad55cfde7f61395618991543694b35183f9c6ad7 (diff)
downloadbox64-b527ebbf5be0949df3b9dcf0806109acc8119476.tar.gz
box64-b527ebbf5be0949df3b9dcf0806109acc8119476.zip
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
Diffstat (limited to 'src/wrapped/wrappedlibxext.c')
-rw-r--r--src/wrapped/wrappedlibxext.c21
1 files changed, 2 insertions, 19 deletions
diff --git a/src/wrapped/wrappedlibxext.c b/src/wrapped/wrappedlibxext.c
index 06088a83..0b7cfd92 100644
--- a/src/wrapped/wrappedlibxext.c
+++ b/src/wrapped/wrappedlibxext.c
@@ -391,26 +391,9 @@ EXPORT void* my_XextAddDisplay(x64emu_t* emu, void* extinfo, void* dpy, void* ex
 }
 
 #ifdef ANDROID
-    #define CUSTOM_INIT                 \
-        getMy(lib);                     \
-        setNeededLibs(lib, 5,           \
-            "libX11.so",              \
-            "libxcb.so",              \
-            "libXau.so",              \
-            "libdl.so",               \
-            "libXdmcp.so");
+#define NEEDED_LIBS "libX11.so", "libxcb.so", "libXau.so", "libdl.so", "libXdmcp.so"
 #else
-    #define CUSTOM_INIT                 \
-        getMy(lib);                     \
-        setNeededLibs(lib, 5,           \
-            "libX11.so.6",              \
-            "libxcb.so.1",              \
-            "libXau.so.6",              \
-            "libdl.so.2",               \
-            "libXdmcp.so.6");
+#define NEEDED_LIBS "libX11.so.6", "libxcb.so.1", "libXau.so.6", "libdl.so.2", "libXdmcp.so.6"
 #endif
 
-#define CUSTOM_FINI \
-    freeMy();
-
 #include "wrappedlib_init.h"