Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-12-27 16:31:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #213 from robxnano/x11-no-threads

Browse Source 
Remove call to XInitThreads
This commit is contained in:
kanjitalk755 2024-10-10 09:21:57 +09:00 committed by GitHub
commit 30a0789f4d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BasiliskII/src/Unix/configure.ac
View File

@ -916,9 +916,6 @@ if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
EXTRASYSSRCS="$EXTRASYSSRCS ../dummy/clip_dummy.cpp" EXTRASYSSRCS="$EXTRASYSSRCS ../dummy/clip_dummy.cpp"
;; ;;
esac esac
if [[ "$WANT_GTK" != "no" ]]; then
LIBS="$LIBS -lX11"
fi
fi fi
elif [[ "x$WANT_MACOSX_GUI" != "xyes" ]]; then elif [[ "x$WANT_MACOSX_GUI" != "xyes" ]]; then
VIDEOSRCS="video_x.cpp" VIDEOSRCS="video_x.cpp"

6
BasiliskII/src/Unix/main_unix.cpp
View File

@ -67,9 +67,6 @@ struct sigstate {
#ifdef ENABLE_GTK #ifdef ENABLE_GTK
# include <gtk/gtk.h> # include <gtk/gtk.h>
# include <gdk/gdk.h> # include <gdk/gdk.h>
# if !defined(GDK_WINDOWING_QUARTZ) && !defined(GDK_WINDOWING_WAYLAND)
# include <X11/Xlib.h>
# endif
# if GTK_CHECK_VERSION(3, 14, 0) # if GTK_CHECK_VERSION(3, 14, 0)
# define ENABLE_GTK3 # define ENABLE_GTK3
# endif # endif
@ -455,9 +452,6 @@ int main(int argc, char **argv)
#ifdef ENABLE_GTK3 #ifdef ENABLE_GTK3
GtkApplication *app = NULL; GtkApplication *app = NULL;
int ret; int ret;
#endif
#if defined(ENABLE_GTK) && !defined(GDK_WINDOWING_QUARTZ) && !defined(GDK_WINDOWING_WAYLAND)
XInitThreads();
#endif #endif
const char *vmdir = NULL; const char *vmdir = NULL;
char str[256]; char str[256];

3
SheepShaver/src/Unix/configure.ac
View File

@ -790,9 +790,6 @@ if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
CPPFLAGS="$CPPFLAGS -I../MacOSX" CPPFLAGS="$CPPFLAGS -I../MacOSX"
else else
EXTRASYSSRCS="$EXTRASYSSRCS ../dummy/clip_dummy.cpp" EXTRASYSSRCS="$EXTRASYSSRCS ../dummy/clip_dummy.cpp"
if [[ "$WANT_GTK" != "no" ]]; then
LIBS="$LIBS -lX11"
fi
fi fi
else else
VIDEOSRCS="video_x.cpp" VIDEOSRCS="video_x.cpp"

6
SheepShaver/src/Unix/main_unix.cpp
View File

@ -141,9 +141,6 @@
#ifdef ENABLE_GTK #ifdef ENABLE_GTK
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk/gdk.h> #include <gdk/gdk.h>
#if !defined(GDK_WINDOWING_QUARTZ) && !defined(GDK_WINDOWING_WAYLAND)
#include <X11/Xlib.h>
#endif
#if GTK_CHECK_VERSION(3, 14, 0) #if GTK_CHECK_VERSION(3, 14, 0)
#define ENABLE_GTK3 #define ENABLE_GTK3
#endif #endif
@ -794,9 +791,6 @@ int main(int argc, char **argv)
#ifdef ENABLE_GTK3 #ifdef ENABLE_GTK3
GtkApplication *app = NULL; GtkApplication *app = NULL;
int ret; int ret;
#endif
#if defined(ENABLE_GTK) && !defined(GDK_WINDOWING_QUARTZ) && !defined(GDK_WINDOWING_WAYLAND)
XInitThreads();
#endif #endif
char str[256]; char str[256];
bool memory_mapped_from_zero, ram_rom_areas_contiguous; bool memory_mapped_from_zero, ram_rom_areas_contiguous;