Merge pull request #2008 from Sonicadvance1/disable_32_bit_x11

ThunkLibs: X11/Xext: Removes two functions that don't exist on 32-bit
FEX-Emu · Sep 25, 2022 · cc4c705 · cc4c705
2 parents c262362 + 107cae2
commit cc4c705
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/ThunkLibs/libX11/libX11_interface.cpp b/ThunkLibs/libX11/libX11_interface.cpp
@@ -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> {};
 

diff --git a/ThunkLibs/libXext/libXext_interface.cpp b/ThunkLibs/libXext/libXext_interface.cpp
@@ -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> {};