ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #316 from perallard/master 

Issue: can't compile on Arch Linux #304
This commit is contained in:
zeromus 2020-01-20 16:15:36 -05:00 committed by GitHub
parent ce2c1a6774 f814164de2
commit bca921ddae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
desmume/src/frontend/posix/cli/main.cpp
View File

@ -568,10 +568,6 @@ int main(int argc, char ** argv) {
slot2_Init(); slot2_Init();
slot2_Change((NDS_SLOT2_TYPE)slot2_device_type); slot2_Change((NDS_SLOT2_TYPE)slot2_device_type);
#if !g_thread_supported()
g_thread_init( NULL);
#endif
driver = new BaseDriver(); driver = new BaseDriver();
#ifdef GDB_STUB #ifdef GDB_STUB

10
desmume/src/frontend/posix/gtk-glade/main.cpp
View File

@ -334,10 +334,8 @@ gchar * get_ui_file (const char *filename)
void * void *
createThread_gdb( void (*thread_function)( void *data), createThread_gdb( void (*thread_function)( void *data),
void *thread_data) { void *thread_data) {
GThread *new_thread = g_thread_create( (GThreadFunc)thread_function, GThread *new_thread = g_thread_new(NULL, (GThreadFunc)thread_function,
thread_data, thread_data);
TRUE,
NULL);
return new_thread; return new_thread;
} }
@ -531,10 +529,6 @@ int main(int argc, char *argv[]) {
fprintf(stderr, "Warning: X11 not thread-safe\n"); fprintf(stderr, "Warning: X11 not thread-safe\n");
} }
#if !g_thread_supported()
g_thread_init( NULL);
#endif
gtk_init(&argc, &argv); gtk_init(&argc, &argv);
#ifdef GTKGLEXT_AVAILABLE #ifdef GTKGLEXT_AVAILABLE

11
desmume/src/frontend/posix/gtk/main.cpp
View File

@ -789,10 +789,9 @@ void *
createThread_gdb( void (*thread_function)( void *data), createThread_gdb( void (*thread_function)( void *data),
void *thread_data) void *thread_data)
{ {
GThread *new_thread = g_thread_create( (GThreadFunc)thread_function, GThread *new_thread = g_thread_new(NULL,
thread_data, (GThreadFunc)thread_function,
TRUE, thread_data);
NULL);
return new_thread; return new_thread;
} }
@ -3612,10 +3611,6 @@ int main (int argc, char *argv[])
fprintf(stderr, "Warning: X11 not thread-safe\n"); fprintf(stderr, "Warning: X11 not thread-safe\n");
} }
#if !g_thread_supported()
g_thread_init( NULL);
#endif
gtk_init(&argc, &argv); gtk_init(&argc, &argv);
if ( !fill_configured_features( &my_config, argv)) { if ( !fill_configured_features( &my_config, argv)) {