diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2011-10-16 21:50:26 -0400 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2011-10-16 21:50:26 -0400 |
| commit | a6d9cf3380a3be9ea518227cba3c571726bb99c6 (patch) | |
| tree | 99b1771788ae0a301eaa2a1e4f5351350612c22a | |
| parent | 3eec796b18e56351638cc6c0c03ab481618d0e29 (diff) | |
gthread/: fix up declarations
g_thread_init() is now a deprecated API, so drop G_DISABLE_DEPRECATED
from the CFLAGS for gthread/. Add the missing declaration for
g_thread_init_with_errorcheck_mutexes() back to deprecated/gthread.h.
| -rw-r--r-- | glib/deprecated/gthread.h | 2 | ||||
| -rw-r--r-- | gthread/Makefile.am | 3 | ||||
| -rw-r--r-- | gthread/gthread-impl.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/glib/deprecated/gthread.h b/glib/deprecated/gthread.h index 7a5c32718..6dc0b7f2c 100644 --- a/glib/deprecated/gthread.h +++ b/glib/deprecated/gthread.h @@ -257,6 +257,8 @@ gboolean g_once_init_enter_impl (volatile gsize *location); GLIB_DEPRECATED void g_thread_init (gpointer vtable); +GLIB_DEPRECATED +void g_thread_init_with_errorcheck_mutexes (gpointer vtable); GLIB_DEPRECATED gboolean g_thread_get_initialized (void); diff --git a/gthread/Makefile.am b/gthread/Makefile.am index 7ff1c5b74..4cf4df050 100644 --- a/gthread/Makefile.am +++ b/gthread/Makefile.am @@ -6,8 +6,7 @@ AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"GThread\" \ -DGLIB_COMPILATION \ @GTHREAD_COMPILE_IMPL_DEFINES@ \ - @GLIB_DEBUG_FLAGS@ \ - -DG_DISABLE_DEPRECATED + @GLIB_DEBUG_FLAGS@ EXTRA_DIST += \ makefile.msc.in \ diff --git a/gthread/gthread-impl.c b/gthread/gthread-impl.c index b0480ea4d..fd03b1d68 100644 --- a/gthread/gthread-impl.c +++ b/gthread/gthread-impl.c @@ -31,7 +31,7 @@ * MT safe */ -#include "glib.h" +#include <glib.h> void g_thread_init (gpointer init) |