Skip to content

Commit

Permalink
ThunkLibs: X11/Xext: Removes two functions that don't exist on 32-bit
Browse files Browse the repository at this point in the history
_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.
  • Loading branch information
Sonicadvance1 committed Sep 24, 2022
1 parent 6742e0c commit 107cae2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 3 additions & 1 deletion ThunkLibs/libX11/libX11_interface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -601,10 +601,12 @@ template<> struct fex_gen_config<XESetError> : fexgen::returns_guest_pointer {};

template<> struct fex_gen_config<XSetIOErrorHandler> : 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> {};

Expand Down
2 changes: 2 additions & 0 deletions ThunkLibs/libXext/libXext_interface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,10 @@ template<> struct fex_gen_config<XextRemoveDisplay> {};
template<> struct fex_gen_config<XextFindDisplay> {};
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> {};
Expand Down

0 comments on commit 107cae2

Please sign in to comment.