From bf3e1b1cf338e2e276a91840757e9bc194417504 Mon Sep 17 00:00:00 2001 From: matthias gatto Date: Thu, 11 Oct 2018 23:57:30 +0200 Subject: [PATCH] posix: fix deprecated warning about g_thread_init problems with the old if, is that the code still compiled(but optimised out) as g_thread_supported is a macro, #if work well enouth and doesn't generate warning --- desmume/src/frontend/posix/cli/main.cpp | 4 ++-- desmume/src/frontend/posix/gtk-glade/main.cpp | 5 +++-- desmume/src/frontend/posix/gtk/main.cpp | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/desmume/src/frontend/posix/cli/main.cpp b/desmume/src/frontend/posix/cli/main.cpp index fee0b4253..a8edd3a1f 100644 --- a/desmume/src/frontend/posix/cli/main.cpp +++ b/desmume/src/frontend/posix/cli/main.cpp @@ -574,9 +574,9 @@ int main(int argc, char ** argv) { slot2_Init(); slot2_Change((NDS_SLOT2_TYPE)slot2_device_type); - if ( !g_thread_supported()) { +#if !g_thread_supported() g_thread_init( NULL); - } +#endif driver = new BaseDriver(); diff --git a/desmume/src/frontend/posix/gtk-glade/main.cpp b/desmume/src/frontend/posix/gtk-glade/main.cpp index 623b1a246..aa5667644 100755 --- a/desmume/src/frontend/posix/gtk-glade/main.cpp +++ b/desmume/src/frontend/posix/gtk-glade/main.cpp @@ -539,8 +539,9 @@ int main(int argc, char *argv[]) { fprintf(stderr, "Warning: X11 not thread-safe\n"); } - if (!g_thread_supported()) - g_thread_init( NULL); +#if !g_thread_supported() + g_thread_init( NULL); +#endif gtk_init(&argc, &argv); diff --git a/desmume/src/frontend/posix/gtk/main.cpp b/desmume/src/frontend/posix/gtk/main.cpp index 0b8ba7d0f..9dcbd494a 100644 --- a/desmume/src/frontend/posix/gtk/main.cpp +++ b/desmume/src/frontend/posix/gtk/main.cpp @@ -3511,8 +3511,9 @@ int main (int argc, char *argv[]) fprintf(stderr, "Warning: X11 not thread-safe\n"); } - if (!g_thread_supported()) +#if !g_thread_supported() g_thread_init( NULL); +#endif gtk_init(&argc, &argv);