Small change to avoid wlib_t declaration in wrappedlibs.h (from box86)

40 files changed, 45 insertions, 44 deletions

diff --git a/src/include/wrappedlibs.h b/src/include/wrappedlibs.h
index d593f3f4..6cb350c4 100755
--- a/src/include/wrappedlibs.h
+++ b/src/include/wrappedlibs.h
@@ -4,13 +4,12 @@
 
 typedef struct library_s library_t;
 typedef struct box64context_s  box64context_t;
-typedef struct wlib_s wlib_t;
 
 typedef int (*wrappedlib_init_t)(library_t * lib, box64context_t* box64);  // 0 = success
 typedef void (*wrappedlib_fini_t)(library_t * lib);
 typedef int (*wrappedlib_get_t)(library_t* lib, const char* name, uintptr_t *offs, uintptr_t *sz, int version, const char* vername, int local);
 
-void setNeededLibs(wlib_t* wlib, int n, ...);
+void setNeededLibs(library_t* lib, int n, ...);
 #define SETALT(A)       lib->altmy = strdup(#A)
 #define SETALTPREFIX(A) lib->priv.w.altprefix = strdup(A)
 
diff --git a/src/librarian/library.c b/src/librarian/library.c
index 8f9731c2..c09355c7 100755
--- a/src/librarian/library.c
+++ b/src/librarian/library.c
@@ -925,14 +925,16 @@ void AddMainElfToLinkmap(elfheader_t* elf)
     lm->l_ld = GetDynamicSection(elf);
 }
 
-void setNeededLibs(wlib_t* wlib, int n, ...)
+void setNeededLibs(library_t* lib, int n, ...)
 {
-    wlib->needed = n;
-    wlib->neededlibs = (char**)calloc(n, sizeof(char*));
+    if(lib->type!=0)
+        return;
+    lib->priv.w.needed = n;
+    lib->priv.w.neededlibs = (char**)calloc(n, sizeof(char*));
     va_list va;
     va_start (va, n);
     for (int i=0; i<n; ++i) {
-        wlib->neededlibs[i] = strdup(va_arg(va, char*));
+        lib->priv.w.neededlibs[i] = strdup(va_arg(va, char*));
     }
     va_end (va);
 }
\ No newline at end of file
diff --git a/src/wrapped/wrappedalure.c b/src/wrapped/wrappedalure.c
index f3d216c6..6491903c 100755
--- a/src/wrapped/wrappedalure.c
+++ b/src/wrapped/wrappedalure.c
@@ -15,7 +15,7 @@ const char* alureName = "libalure.so.1";
 #define LIBNAME alure
 
 #define CUSTOM_INIT \
-    setNeededLibs(&lib->priv.w, 1, "libopenal.so.1");
+    setNeededLibs(lib, 1, "libopenal.so.1");
 
 #include "wrappedlib_init.h"
 
diff --git a/src/wrapped/wrappedalut.c b/src/wrapped/wrappedalut.c
index cb0f2d2e..a74eaa76 100755
--- a/src/wrapped/wrappedalut.c
+++ b/src/wrapped/wrappedalut.c
@@ -15,7 +15,7 @@ const char* alutName = "libalut.so.0";
 #define LIBNAME alut
 
 #define CUSTOM_INIT \
-    setNeededLibs(&lib->priv.w, 1, "libopenal.so.1");
+    setNeededLibs(lib, 1, "libopenal.so.1");
 
 #include "wrappedlib_init.h"
 
diff --git a/src/wrapped/wrappedatkbridge.c b/src/wrapped/wrappedatkbridge.c
index 22d94742..dfc0d199 100755
--- a/src/wrapped/wrappedatkbridge.c
+++ b/src/wrapped/wrappedatkbridge.c
@@ -20,7 +20,7 @@ const char* atkbridgeName = "libatk-bridge-2.0.so.0";
         return -1;
 
 #define CUSTOM_INIT \
-    setNeededLibs(&lib->priv.w, 5,      \
+    setNeededLibs(lib, 5,               \
         "libatk-1.0.so.0",              \
         "libSM.so.6",                   \
         "libICE.so.6",                  \
diff --git a/src/wrapped/wrappedgdkx112.c b/src/wrapped/wrappedgdkx112.c
index d1caef01..4f3aeba4 100755
--- a/src/wrapped/wrappedgdkx112.c
+++ b/src/wrapped/wrappedgdkx112.c
@@ -127,7 +127,7 @@ EXPORT void my_gdk_window_remove_filter(x64emu_t* emu, void* window, void* f, vo
 #define CUSTOM_INIT         \
     libname = lib->name;    \
     getMy(lib);             \
-    setNeededLibs(&lib->priv.w, 3, "libgobject-2.0.so.0", "libgio-2.0.so.0", "libgdk_pixbuf-2.0.so.0");
+    setNeededLibs(lib, 3, "libgobject-2.0.so.0", "libgio-2.0.so.0", "libgdk_pixbuf-2.0.so.0");
 
 #define CUSTOM_FINI \
     freeMy(); \
diff --git a/src/wrapped/wrappedgio2.c b/src/wrapped/wrappedgio2.c
index 5be5f7af..a0db17da 100755
--- a/src/wrapped/wrappedgio2.c
+++ b/src/wrapped/wrappedgio2.c
@@ -588,7 +588,7 @@ EXPORT void* my_g_initable_new_valist(x64emu_t* emu, void* type, void* first, x6
 
 #define CUSTOM_INIT \
     getMy(lib);                         \
-    setNeededLibs(&lib->priv.w, 1, "libgmodule-2.0.so.0");
+    setNeededLibs(lib, 1, "libgmodule-2.0.so.0");
 
 #define CUSTOM_FINI \
     freeMy();
diff --git a/src/wrapped/wrappedgmodule2.c b/src/wrapped/wrappedgmodule2.c
index 5e6510ff..b5681d4e 100755
--- a/src/wrapped/wrappedgmodule2.c
+++ b/src/wrapped/wrappedgmodule2.c
@@ -20,6 +20,6 @@ const char* gmodule2Name = "libgmodule-2.0.so.0";
         return -1;
 
 #define CUSTOM_INIT \
-    setNeededLibs(&lib->priv.w, 1, "libglib-2.0.so.0");
+    setNeededLibs(lib, 1, "libglib-2.0.so.0");
 
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedgobject2.c b/src/wrapped/wrappedgobject2.c
index f5eeb3df..fa564211 100755
--- a/src/wrapped/wrappedgobject2.c
+++ b/src/wrapped/wrappedgobject2.c
@@ -859,7 +859,7 @@ EXPORT void my_g_object_weak_ref(x64emu_t* emu, void* object, void* notify, void
     getMy(lib);                             \
     SetGObjectID(my->g_object_get_type());  \
     SetGTypeName(my->g_type_name);          \
-    setNeededLibs(&lib->priv.w, 1, "libglib-2.0.so.0");
+    setNeededLibs(lib, 1, "libglib-2.0.so.0");
 
 #define CUSTOM_FINI \
     FiniGTKClass(); \
diff --git a/src/wrapped/wrappedgtkx112.c b/src/wrapped/wrappedgtkx112.c
index aafddfc2..e732f524 100755
--- a/src/wrapped/wrappedgtkx112.c
+++ b/src/wrapped/wrappedgtkx112.c
@@ -1128,7 +1128,7 @@ EXPORT void* my_gtk_link_button_set_uri_hook(x64emu_t* emu, void* f, void* data,
     SetGtkFrameID(my->gtk_frame_get_type());                                    \
     SetGtkMenuShellID(my->gtk_menu_shell_get_type());                           \
     SetGtkMenuBarID(my->gtk_menu_bar_get_type());                               \
-    setNeededLibs(&lib->priv.w, 2, "libgdk-x11-2.0.so.0", "libpangocairo-1.0.so.0");
+    setNeededLibs(lib, 2, "libgdk-x11-2.0.so.0", "libpangocairo-1.0.so.0");
 
 #define CUSTOM_FINI \
     freeMy();
diff --git a/src/wrapped/wrappedldapr.c b/src/wrapped/wrappedldapr.c
index 4863e9cd..7b5087e4 100755
--- a/src/wrapped/wrappedldapr.c
+++ b/src/wrapped/wrappedldapr.c
@@ -76,7 +76,7 @@ EXPORT int my_ldap_sasl_interactive_bind_s(x64emu_t* emu, void* ld, void* dn, vo
 
 #define CUSTOM_INIT \
     getMy(lib);         \
-    setNeededLibs(&lib->priv.w, 1, NEEDED_LIB);
+    setNeededLibs(lib, 1, NEEDED_LIB);
 
 #define CUSTOM_FINI \
     freeMy();
diff --git a/src/wrapped/wrappedlibc.c b/src/wrapped/wrappedlibc.c
index 8fe3c13e..5e3ebd40 100755
--- a/src/wrapped/wrappedlibc.c
+++ b/src/wrapped/wrappedlibc.c
@@ -2731,7 +2731,7 @@ EXPORT char my___libc_single_threaded = 0;
     my___progname = my_program_invocation_short_name =                          \
         strrchr(box64->argv[0], '/') + 1;                                       \
     getMy(lib);                                                                 \
-    setNeededLibs(&lib->priv.w, 3,                                              \
+    setNeededLibs(lib, 3,                                              \
         "ld-linux-x86-64.so.2",                                                 \
         "libpthread.so.0",                                                      \
         "librt.so.1");
diff --git a/src/wrapped/wrappedlibglu.c b/src/wrapped/wrappedlibglu.c
index 2e08ec99..082e724c 100755
--- a/src/wrapped/wrappedlibglu.c
+++ b/src/wrapped/wrappedlibglu.c
@@ -134,7 +134,7 @@ void EXPORT my_gluNurbsCallback(x64emu_t* emu, void* a, int32_t b, void* cb)
 #define CUSTOM_INIT                     \
     box64->libglu = lib;                \
     getMy(lib);                         \
-    setNeededLibs(&lib->priv.w, 1, "libGL.so.1");
+    setNeededLibs(lib, 1, "libGL.so.1");
 
 #define CUSTOM_FINI             \
     freeMy();
diff --git a/src/wrapped/wrappedlibncurses.c b/src/wrapped/wrappedlibncurses.c
index f9d49767..defcd98c 100755
--- a/src/wrapped/wrappedlibncurses.c
+++ b/src/wrapped/wrappedlibncurses.c
@@ -82,7 +82,7 @@ EXPORT void* my_initscr()
 
 #define CUSTOM_INIT \
     getMy(lib); \
-    setNeededLibs(&lib->priv.w,  1, "libtinfo.so.5");
+    setNeededLibs(lib,  1, "libtinfo.so.5");
 
 #define CUSTOM_FINI \
     freeMy();
diff --git a/src/wrapped/wrappedlibncurses6.c b/src/wrapped/wrappedlibncurses6.c
index a41dacac..8193ec2d 100755
--- a/src/wrapped/wrappedlibncurses6.c
+++ b/src/wrapped/wrappedlibncurses6.c
@@ -83,7 +83,7 @@ EXPORT void* my6_initscr()
 #define CUSTOM_INIT \
     getMy(lib);     \
     SETALT(my6_);   \
-    setNeededLibs(&lib->priv.w, 1, "libtinfo.so.6");
+    setNeededLibs(lib, 1, "libtinfo.so.6");
 
 #define CUSTOM_FINI \
     freeMy();
diff --git a/src/wrapped/wrappedlibncursesw.c b/src/wrapped/wrappedlibncursesw.c
index 51ada784..2beb3e7e 100755
--- a/src/wrapped/wrappedlibncursesw.c
+++ b/src/wrapped/wrappedlibncursesw.c
@@ -81,7 +81,7 @@ EXPORT void* myw_initscr()
 #define CUSTOM_INIT \
     getMy(lib);     \
     SETALT(myw_);   \
-    setNeededLibs(&lib->priv.w, 1, "libtinfo.so.5");
+    setNeededLibs(lib, 1, "libtinfo.so.5");
 
 #define CUSTOM_FINI \
     freeMy();
diff --git a/src/wrapped/wrappedlibncursesw6.c b/src/wrapped/wrappedlibncursesw6.c
index e6431777..4e440dc1 100755
--- a/src/wrapped/wrappedlibncursesw6.c
+++ b/src/wrapped/wrappedlibncursesw6.c
@@ -81,7 +81,7 @@ EXPORT void* myw6_initscr()
 #define CUSTOM_INIT \
     getMy(lib);     \
     SETALT(myw6_);  \
-    setNeededLibs(&lib->priv.w, 1, "libtinfo.so.6");
+    setNeededLibs(lib, 1, "libtinfo.so.6");
 
 #define CUSTOM_FINI \
     freeMy();
diff --git a/src/wrapped/wrappedlibxext.c b/src/wrapped/wrappedlibxext.c
index 56c563bc..7d8aebc2 100755
--- a/src/wrapped/wrappedlibxext.c
+++ b/src/wrapped/wrappedlibxext.c
@@ -216,7 +216,7 @@ EXPORT void* my_XextAddDisplay(x64emu_t* emu, void* extinfo, void* dpy, void* ex
 
 #define CUSTOM_INIT                 \
     getMy(lib);                     \
-    setNeededLibs(&lib->priv.w, 5,  \
+    setNeededLibs(lib, 5,           \
         "libX11.so.6",              \
         "libxcb.so.1",              \
         "libXau.so.6",              \
diff --git a/src/wrapped/wrappedlibxfixes.c b/src/wrapped/wrappedlibxfixes.c
index 6d97b551..6ee42f8d 100755
--- a/src/wrapped/wrappedlibxfixes.c
+++ b/src/wrapped/wrappedlibxfixes.c
@@ -15,7 +15,7 @@ const char* libxfixesName = "libXfixes.so.3";
 #define LIBNAME libxfixes
 
 #define CUSTOM_INIT \
-    setNeededLibs(&lib->priv.w, 4,  \
+    setNeededLibs(lib, 4,           \
         "libX11.so.6",              \
         "libxcb.so.1",              \
         "libXau.so.6",              \
diff --git a/src/wrapped/wrappedlibxft.c b/src/wrapped/wrappedlibxft.c
index 9280239c..b779f938 100755
--- a/src/wrapped/wrappedlibxft.c
+++ b/src/wrapped/wrappedlibxft.c
@@ -15,7 +15,7 @@ const char* libxftName = "libXft.so.2";
 #define LIBNAME libxft
 
 #define CUSTOM_INIT \
-    setNeededLibs(&lib->priv.w, 4,  \
+    setNeededLibs(lib, 4,           \
         "libX11.so.6",              \
         "libfontconfig.so.1",       \
         "libXrender.so.1",          \
diff --git a/src/wrapped/wrappedlibxi.c b/src/wrapped/wrappedlibxi.c
index 57458dcd..0d2d0653 100755
--- a/src/wrapped/wrappedlibxi.c
+++ b/src/wrapped/wrappedlibxi.c
@@ -15,7 +15,7 @@ const char* libxiName = "libXi.so.6";
 #define LIBNAME libxi
 
 #define CUSTOM_INIT \
-    setNeededLibs(&lib->priv.w, 2, "libX11.so.6", "libXext.so.6");
+    setNeededLibs(lib, 2, "libX11.so.6", "libXext.so.6");
 
 #include "wrappedlib_init.h"
 
diff --git a/src/wrapped/wrappedlibxmu.c b/src/wrapped/wrappedlibxmu.c
index 24c75d4e..225f682c 100755
--- a/src/wrapped/wrappedlibxmu.c
+++ b/src/wrapped/wrappedlibxmu.c
@@ -15,7 +15,7 @@ const char* libxmuName = "libXmu.so.6";
 #define LIBNAME libxmu
 
 #define CUSTOM_INIT \
-    setNeededLibs(&lib->priv.w, 2, "libX11.so.6", "libXext.so.6");
+    setNeededLibs(lib, 2, "libX11.so.6", "libXext.so.6");
 
 #include "wrappedlib_init.h"
 
diff --git a/src/wrapped/wrappedlibxpm.c b/src/wrapped/wrappedlibxpm.c
index 38fd353f..b978082c 100755
--- a/src/wrapped/wrappedlibxpm.c
+++ b/src/wrapped/wrappedlibxpm.c
@@ -15,6 +15,6 @@ const char* libxpmName = "libXpm.so.4";
 #define LIBNAME libxpm
 
 #define CUSTOM_INIT \
-    setNeededLibs(&lib->priv.w, 2, "libX11.so.6", "libXext.so.6");
+    setNeededLibs(lib, 2, "libX11.so.6", "libXext.so.6");
 
 #include "wrappedlib_init.h"
\ No newline at end of file
diff --git a/src/wrapped/wrappedlibxrandr.c b/src/wrapped/wrappedlibxrandr.c
index 054864ae..b74cca04 100755
--- a/src/wrapped/wrappedlibxrandr.c
+++ b/src/wrapped/wrappedlibxrandr.c
@@ -21,7 +21,7 @@ const char* libxrandrName = "libXrandr.so.2";
 #define LIBNAME libxrandr
 
 #define CUSTOM_INIT \
-    setNeededLibs(&lib->priv.w, 3,  \
+    setNeededLibs(lib, 3,           \
         "libX11.so.6",              \
         "libXext.so.6",             \
         "libXrender.so.1");
diff --git a/src/wrapped/wrappedlibxrender.c b/src/wrapped/wrappedlibxrender.c
index b6aefe24..ff2c218f 100755
--- a/src/wrapped/wrappedlibxrender.c
+++ b/src/wrapped/wrappedlibxrender.c
@@ -15,7 +15,7 @@ const char* libxrenderName = "libXrender.so.1";
 #define LIBNAME libxrender
 
 #define CUSTOM_INIT \
-    setNeededLibs(&lib->priv.w, 4,  \
+    setNeededLibs(lib, 4,           \
         "libX11.so.6",              \
         "libxcb.so.1",              \
         "libXau.so.6",              \
diff --git a/src/wrapped/wrappedlibxss.c b/src/wrapped/wrappedlibxss.c
index 277cb7e9..00c00b90 100755
--- a/src/wrapped/wrappedlibxss.c
+++ b/src/wrapped/wrappedlibxss.c
@@ -15,6 +15,6 @@ const char* libxssName = "libXss.so.1";
 #define LIBNAME libxss
 
 #define CUSTOM_INIT \
-    setNeededLibs(&lib->priv.w, 2, "libX11.so.6", "libXext.so.6");
+    setNeededLibs(lib, 2, "libX11.so.6", "libXext.so.6");
 
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedlibxt.c b/src/wrapped/wrappedlibxt.c
index 6f819d06..6177ae84 100755
--- a/src/wrapped/wrappedlibxt.c
+++ b/src/wrapped/wrappedlibxt.c
@@ -124,7 +124,7 @@ EXPORT long my_XtAppAddInput(x64emu_t* emu, void* context, int source, void* con
 
 #define CUSTOM_INIT \
     getMy(lib);   \
-    setNeededLibs(&lib->priv.w, 2, "libX11.so.6", "libXext.so.6");
+    setNeededLibs(lib, 2, "libX11.so.6", "libXext.so.6");
 
 #define CUSTOM_FINI \
     freeMy();
diff --git a/src/wrapped/wrappedlibxtst.c b/src/wrapped/wrappedlibxtst.c
index a99be56f..eaec1de6 100755
--- a/src/wrapped/wrappedlibxtst.c
+++ b/src/wrapped/wrappedlibxtst.c
@@ -68,7 +68,7 @@ EXPORT int my_XRecordEnableContext(x64emu_t* emu, void* display, void* context,
 
 #define CUSTOM_INIT \
     getMy(lib);     \
-    setNeededLibs(&lib->priv.w, 2, "libX11.so.6", "libXext.so.6");
+    setNeededLibs(lib, 2, "libX11.so.6", "libXext.so.6");
 
 #define CUSTOM_FINI \
     freeMy();
diff --git a/src/wrapped/wrappedlibxxf86vm.c b/src/wrapped/wrappedlibxxf86vm.c
index 9ac4a3c4..3f24e95f 100755
--- a/src/wrapped/wrappedlibxxf86vm.c
+++ b/src/wrapped/wrappedlibxxf86vm.c
@@ -22,6 +22,6 @@ const char* libxxf86vmName = "libXxf86vm.so.1";
 
 
 #define CUSTOM_INIT \
-    setNeededLibs(&lib->priv.w, 2, "libX11.so.6", "libXext.so.6");
+    setNeededLibs(lib, 2, "libX11.so.6", "libXext.so.6");
 
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedpango.c b/src/wrapped/wrappedpango.c
index 52f73af8..dc0ccf41 100755
--- a/src/wrapped/wrappedpango.c
+++ b/src/wrapped/wrappedpango.c
@@ -98,7 +98,7 @@ EXPORT void my_pango_attribute_init(x64emu_t* emu, void* attr, my_PangoAttrClass
 
 #define CUSTOM_INIT \
     getMy(lib); \
-    setNeededLibs(&lib->priv.w, 2, "libgobject-2.0.so.0", "libglib-2.0.so.0");
+    setNeededLibs(lib, 2, "libgobject-2.0.so.0", "libglib-2.0.so.0");
 
 #define CUSTOM_FINI \
     freeMy();
diff --git a/src/wrapped/wrappedpangocairo.c b/src/wrapped/wrappedpangocairo.c
index 19e8cb6b..d1b20176 100755
--- a/src/wrapped/wrappedpangocairo.c
+++ b/src/wrapped/wrappedpangocairo.c
@@ -16,7 +16,7 @@ const char* pangocairoName = "libpangocairo-1.0.so.0";
 #define LIBNAME pangocairo
 
 #define CUSTOM_INIT \
-    setNeededLibs(&lib->priv.w, 1, "libpango-1.0.so.0");
+    setNeededLibs(lib, 1, "libpango-1.0.so.0");
 
 
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedpangoft2.c b/src/wrapped/wrappedpangoft2.c
index 37efa6d0..3a9838b9 100755
--- a/src/wrapped/wrappedpangoft2.c
+++ b/src/wrapped/wrappedpangoft2.c
@@ -15,6 +15,6 @@ const char* pangoft2Name = "libpangoft2-1.0.so.0";
 #define LIBNAME pangoft2
 
 #define CUSTOM_INIT \
-    setNeededLibs(&lib->priv.w, 2, "libfontconfig.so.1", "libfreetype.so.6");
+    setNeededLibs(lib, 2, "libfontconfig.so.1", "libfreetype.so.6");
 
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedpulsesimple.c b/src/wrapped/wrappedpulsesimple.c
index 165f3f29..1fd5681b 100755
--- a/src/wrapped/wrappedpulsesimple.c
+++ b/src/wrapped/wrappedpulsesimple.c
@@ -25,7 +25,7 @@ const char* pulsesimpleName = "libpulse-simple.so.0";
         return -1;
 
 #define CUSTOM_INIT \
-    setNeededLibs(&lib->priv.w, 1, "libpulse.so.0");
+    setNeededLibs(lib, 1, "libpulse.so.0");
 
 #include "wrappedlib_init.h"
 
diff --git a/src/wrapped/wrappedsdl1.c b/src/wrapped/wrappedsdl1.c
index f57c4376..6341c9cb 100755
--- a/src/wrapped/wrappedsdl1.c
+++ b/src/wrapped/wrappedsdl1.c
@@ -458,7 +458,7 @@ EXPORT int32_t my_SDL_GetWMInfo(x64emu_t* emu, void* p)
     getMy(lib);                             \
     box64->sdl1allocrw = my->SDL_AllocRW;   \
     box64->sdl1freerw  = my->SDL_FreeRW;    \
-    setNeededLibs(&lib->priv.w, 3,          \
+    setNeededLibs(lib, 3,                   \
         "libm.so.6",                        \
         "libdl.so.2",                       \
         "librt.so.1");
diff --git a/src/wrapped/wrappedsdl1image.c b/src/wrapped/wrappedsdl1image.c
index f4569773..66eda2c8 100755
--- a/src/wrapped/wrappedsdl1image.c
+++ b/src/wrapped/wrappedsdl1image.c
@@ -68,7 +68,7 @@ void EXPORT *my_IMG_Load_RW(x64emu_t* emu, void* a, int32_t b)
 
 #define CUSTOM_INIT \
     getMy(lib);   \
-    setNeededLibs(&lib->priv.w, 2, "libSDL-1.2.so.0", "libz.so.1");
+    setNeededLibs(lib, 2, "libSDL-1.2.so.0", "libz.so.1");
 
 #define CUSTOM_FINI \
     freeMy();
diff --git a/src/wrapped/wrappedsdl1sound.c b/src/wrapped/wrappedsdl1sound.c
index b82bd482..e77d2a0b 100755
--- a/src/wrapped/wrappedsdl1sound.c
+++ b/src/wrapped/wrappedsdl1sound.c
@@ -32,7 +32,7 @@ EXPORT void* my_Sound_NewSample(x64emu_t* emu, void* a, void* ext, void* desired
 
 #define CUSTOM_INIT \
     getMy(lib);   \
-    setNeededLibs(&lib->priv.w, 1, "libSDL-1.2.so.0");
+    setNeededLibs(lib, 1, "libSDL-1.2.so.0");
 
 #define CUSTOM_FINI \
     freeMy();
diff --git a/src/wrapped/wrappedsdl2.c b/src/wrapped/wrappedsdl2.c
index a8c81937..baefaa74 100755
--- a/src/wrapped/wrappedsdl2.c
+++ b/src/wrapped/wrappedsdl2.c
@@ -814,7 +814,7 @@ EXPORT void my2_SDL_GetJoystickGUIDInfo(SDL_JoystickGUID guid, uint16_t *vend, u
     box64->sdl2allocrw = my->SDL_AllocRW;   \
     box64->sdl2freerw  = my->SDL_FreeRW;    \
     SETALT(my2_);                           \
-    setNeededLibs(&lib->priv.w, 4,          \
+    setNeededLibs(lib, 4,                   \
         "libdl.so.2",                       \
         "libm.so.6",                        \
         "librt.so.1",                       \
diff --git a/src/wrapped/wrappedsdl2image.c b/src/wrapped/wrappedsdl2image.c
index f99e00fb..de520daa 100755
--- a/src/wrapped/wrappedsdl2image.c
+++ b/src/wrapped/wrappedsdl2image.c
@@ -104,7 +104,7 @@ EXPORT void* my2_IMG_LoadTextureTyped_RW(x64emu_t* emu, void* rend, void* a, int
 #define CUSTOM_INIT \
     getMy(lib);     \
     SETALT(my2_);   \
-    setNeededLibs(&lib->priv.w, 1, "libSDL2-2.0.so.0");
+    setNeededLibs(lib, 1, "libSDL2-2.0.so.0");
 
 #define CUSTOM_FINI \
     freeMy();
diff --git a/src/wrapped/wrappedsdl2ttf.c b/src/wrapped/wrappedsdl2ttf.c
index ff1afeb8..b0075b37 100755
--- a/src/wrapped/wrappedsdl2ttf.c
+++ b/src/wrapped/wrappedsdl2ttf.c
@@ -45,7 +45,7 @@ void EXPORT *my2_TTF_OpenFontRW(x64emu_t* emu, void* a, int32_t b, int32_t c)
 #define CUSTOM_INIT                     \
     SETALT(my2_);                       \
     getMy(lib);                         \
-    setNeededLibs(&lib->priv.w, 1, "libSDL2-2.0.so.0");
+    setNeededLibs(lib, 1, "libSDL2-2.0.so.0");
 
 #define CUSTOM_FINI                     \
     freeMy();
diff --git a/src/wrapped/wrappedxinerama.c b/src/wrapped/wrappedxinerama.c
index d105f361..fed2403d 100755
--- a/src/wrapped/wrappedxinerama.c
+++ b/src/wrapped/wrappedxinerama.c
@@ -15,7 +15,7 @@ const char* xineramaName = "libXinerama.so.1";
 #define LIBNAME xinerama
 
 #define CUSTOM_INIT \
-    setNeededLibs(&lib->priv.w, 2, "libX11.so.6", "libXext.so.6");
+    setNeededLibs(lib, 2, "libX11.so.6", "libXext.so.6");
 
 #include "wrappedlib_init.h"