diff options
| author | Alexander Larsson <alexl@redhat.com> | 2011-10-18 13:34:06 +0200 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2011-10-18 13:34:06 +0200 |
| commit | be770969e93f989d7165b240c4e7e5e6ac9c0587 (patch) | |
| tree | bea215b7fc80f1df69452b774592e3eab757d573 | |
| parent | 735420e54690d5971a0e258e12fff6ee79ae34a6 (diff) | |
Don't define GLIB_COMPILATION in libgthread
This was turning all the GLIB_VARs in the glib headers into
dllexports on windows, causing all sort of nastiness. libgthread is
mostly empty now anyway, so we don't need any GLIB_COMPILATION like
flag.
| -rw-r--r-- | glib/gthread-win32.c | 9 | ||||
| -rw-r--r-- | gthread/gthread-impl.c | 4 |
2 files changed, 2 insertions, 11 deletions
diff --git a/glib/gthread-win32.c b/glib/gthread-win32.c index 96c6a1c30..dd777c2de 100644 --- a/glib/gthread-win32.c +++ b/glib/gthread-win32.c @@ -963,13 +963,8 @@ g_thread_lookup_native_funcs (void) G_GNUC_INTERNAL void g_thread_win32_init (void) { - if (g_thread_lookup_native_funcs ()) - fprintf (stderr, "(debug) GThread using native mode\n"); - else - { - fprintf (stderr, "(debug) GThread using Windows XP mode\n"); - g_thread_xp_init (); - } + if (!g_thread_lookup_native_funcs ()) + g_thread_xp_init (); InitializeCriticalSection (&g_private_lock); } diff --git a/gthread/gthread-impl.c b/gthread/gthread-impl.c index fd03b1d68..c7f61a37f 100644 --- a/gthread/gthread-impl.c +++ b/gthread/gthread-impl.c @@ -36,13 +36,9 @@ void g_thread_init (gpointer init) { - if (init != NULL) - g_warning ("GThread system no longer supports custom thread implementations."); } void g_thread_init_with_errorcheck_mutexes (gpointer vtable) { - g_assert (vtable == NULL); - g_warning ("GThread system no longer supports errorcheck mutexes."); } |