luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-11 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Actually Don't define GLIB_COMPILATION in libgthread

Browse Source 
Last commit was wrong, fixing it up
This commit is contained in:
Alexander Larsson 2011-10-18 14:15:07 +02:00
parent be770969e9
commit cf3f1b026b
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
glib/gthread-win32.c
View File

@ -963,8 +963,13 @@ g_thread_lookup_native_funcs (void)
G_GNUC_INTERNAL void
g_thread_win32_init (void)
{
if (!g_thread_lookup_native_funcs ())
g_thread_xp_init ();
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 ();
}
InitializeCriticalSection (&g_private_lock);
}

1
gthread/Makefile.am
View File

@ -4,7 +4,6 @@ include $(top_srcdir)/Makefile.decl
AM_CPPFLAGS = \
$(glib_INCLUDES) \
-DG_LOG_DOMAIN=\"GThread\" \
-DGLIB_COMPILATION \
@GTHREAD_COMPILE_IMPL_DEFINES@ \
@GLIB_DEBUG_FLAGS@

4
gthread/gthread-impl.c
View File

@ -36,9 +36,13 @@
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.");
}