From 107cae2975495f1a8fcaed9a93dd9197f78d6c4c Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sat, 24 Sep 2022 09:51:40 -0700 Subject: [PATCH] ThunkLibs: X11/Xext: Removes two functions that don't exist on 32-bit _XData32 and _XRead32 don't exist as real functions in 32-bit versions of these libraries, these end up just being defines that redirect to the non-suffixed versions of the functions. Noticed this while tinkering around and is easy enough to solve today. --- ThunkLibs/libX11/libX11_interface.cpp | 4 +++- ThunkLibs/libXext/libXext_interface.cpp | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ThunkLibs/libX11/libX11_interface.cpp b/ThunkLibs/libX11/libX11_interface.cpp index 5b81cf4f8..1049091da 100644 --- a/ThunkLibs/libX11/libX11_interface.cpp +++ b/ThunkLibs/libX11/libX11_interface.cpp @@ -601,10 +601,12 @@ template<> struct fex_gen_config : fexgen::returns_guest_pointer {}; template<> struct fex_gen_config : fexgen::returns_guest_pointer {}; +#if __SIZEOF_POINTER__ == 8 +template<> struct fex_gen_config<_XData32> {}; template<> struct fex_gen_config<_XRead32> {}; +#endif template<> struct fex_gen_config<_XRead> {}; template<> struct fex_gen_config<_XReadPad> {}; -template<> struct fex_gen_config<_XData32> {}; template<> struct fex_gen_config<_XEatData> {}; template<> struct fex_gen_config<_XEatDataWords> {}; diff --git a/ThunkLibs/libXext/libXext_interface.cpp b/ThunkLibs/libXext/libXext_interface.cpp index b92b19996..87b0666bb 100644 --- a/ThunkLibs/libXext/libXext_interface.cpp +++ b/ThunkLibs/libXext/libXext_interface.cpp @@ -126,8 +126,10 @@ template<> struct fex_gen_config {}; template<> struct fex_gen_config {}; template<> struct fex_gen_config<_XGetRequest> {}; template<> struct fex_gen_config<_XFlushGCCache> {}; +#if __SIZEOF_POINTER__ == 8 template<> struct fex_gen_config<_XData32> {}; template<> struct fex_gen_config<_XRead32> {}; +#endif template<> struct fex_gen_config<_XDeqAsyncHandler> {}; template<> struct fex_gen_config<_XError> {}; template<> struct fex_gen_config<_XIOError> {};