Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2025-02-19 19:30:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'test_notX'

Browse Source
This commit is contained in:
kanjitalk755 2020-02-08 19:21:14 +09:00
commit c4570fe272
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,7 +63,9 @@ struct sigstate {
# ifdef HAVE_GNOMEUI # ifdef HAVE_GNOMEUI
# include <gnome.h> # include <gnome.h>
# endif # endif
# include <X11/Xlib.h> # if !defined(GDK_WINDOWING_QUARTZ) && !defined(GDK_WINDOWING_WAYLAND)
# include <X11/Xlib.h>
# endif
#endif #endif
#ifdef ENABLE_XF86_DGA #ifdef ENABLE_XF86_DGA
@ -385,7 +387,7 @@ static void usage(const char *prg_name)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
#ifdef ENABLE_GTK #if defined(ENABLE_GTK) && !defined(GDK_WINDOWING_QUARTZ) && !defined(GDK_WINDOWING_WAYLAND)
XInitThreads(); XInitThreads();
#endif #endif
const char *vmdir = NULL; const char *vmdir = NULL;

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

@ -133,8 +133,10 @@
#ifdef ENABLE_GTK #ifdef ENABLE_GTK
#include <gtk/gtk.h> #include <gtk/gtk.h>
#if !defined(GDK_WINDOWING_QUARTZ) && !defined(GDK_WINDOWING_WAYLAND)
#include <X11/Xlib.h> #include <X11/Xlib.h>
#endif #endif
#endif
#ifdef ENABLE_XF86_DGA #ifdef ENABLE_XF86_DGA
#include <X11/Xlib.h> #include <X11/Xlib.h>
@ -729,7 +731,7 @@ static bool init_sdl()
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
#ifdef ENABLE_GTK #if defined(ENABLE_GTK) && !defined(GDK_WINDOWING_QUARTZ) && !defined(GDK_WINDOWING_WAYLAND)
XInitThreads(); XInitThreads();
#endif #endif
char str[256]; char str[256];