about summary refs log tree commit diff stats
path: root/src/wrapped/wrappedgio2.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/wrappedgio2.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/wrappedgio2.c')
-rw-r--r--src/wrapped/wrappedgio2.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/src/wrapped/wrappedgio2.c b/src/wrapped/wrappedgio2.c
index 07c86969..638bc14c 100644
--- a/src/wrapped/wrappedgio2.c
+++ b/src/wrapped/wrappedgio2.c
@@ -629,21 +629,14 @@ EXPORT void my_g_input_stream_read_async(x64emu_t* emu, void* stream, void* buff
     if(box64_nogtk) \
         return -1;
 
-#ifdef ANDROID
 #define CUSTOM_INIT \
-    getMy(lib);                                         \
     SetGApplicationID(my->g_application_get_type());    \
-    SetGDBusProxyID(my->g_dbus_proxy_get_type());       \
-    setNeededLibs(lib, 1, "libgmodule-2.0.so");
+    SetGDBusProxyID(my->g_dbus_proxy_get_type());
+
+#ifdef ANDROID
+#define NEEDED_LIBS "libgmodule-2.0.so"
 #else
-#define CUSTOM_INIT \
-    getMy(lib);                                         \
-    SetGApplicationID(my->g_application_get_type());    \
-    SetGDBusProxyID(my->g_dbus_proxy_get_type());       \
-    setNeededLibs(lib, 1, "libgmodule-2.0.so.0");
+#define NEEDED_LIBS "libgmodule-2.0.so.0"
 #endif
 
-#define CUSTOM_FINI \
-    freeMy();
-
 #include "wrappedlib_init.h"