From 703d19b256bc533d73cf4f206e5c443579aaf4c1 Mon Sep 17 00:00:00 2001 From: rajdakin Date: Mon, 30 Sep 2024 12:26:45 +0200 Subject: Various box32 wrapped libs and script fixes (#1889) * [WRAPPED32] Fixed the rebuild_wrappers_32 script, fixed some libc signatures * [WRAPPED32] Added back xdr functions * [WRAPPED32] Forgot to regenerate wrappers --- src/wrapped/wrappedlibdl_private.h | 10 +++++----- src/wrapped/wrappedlibgl_private.h | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'src/wrapped') diff --git a/src/wrapped/wrappedlibdl_private.h b/src/wrapped/wrappedlibdl_private.h index c2106250..540ddf0f 100644 --- a/src/wrapped/wrappedlibdl_private.h +++ b/src/wrapped/wrappedlibdl_private.h @@ -1,13 +1,15 @@ -#if defined(GO) && defined(GOM) && defined(GO2) && defined(DATA) +#if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA)) +#error Meh... +#endif GOM(dladdr, iFEpp) GOM(dladdr1, iFEpppi) GOM(dlclose, iFEp) GOM(dlerror, pFEv) #ifdef STATICBUILD -//DATAB(_dlfcn_hook, sizeof(void*)) +//DATAB(_dlfcn_hook, 8) #else -DATAB(_dlfcn_hook, sizeof(void*)) +DATAB(_dlfcn_hook, 8) #endif GOM(dlinfo, iFEpip) GOM(dlmopen, pFEppi) @@ -15,5 +17,3 @@ GOM(dlopen, pFEpi) GOM(dlsym, pFEpp) GOM(dlvsym, pFEppp) // Weak GOM(_dl_find_object, iFEpp) - -#endif diff --git a/src/wrapped/wrappedlibgl_private.h b/src/wrapped/wrappedlibgl_private.h index f6d0d6f4..da4ca22d 100644 --- a/src/wrapped/wrappedlibgl_private.h +++ b/src/wrapped/wrappedlibgl_private.h @@ -1,6 +1,7 @@ #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA)) -#error meh! +#error Meh... #endif + //VERSION_1_0 GO(glAccum, vFuf) GO(glAlphaFunc, vFuf) -- cgit 1.4.1