From: Ryan Lortie <desrt@desrt.ca>
Date: Mon, 17 Oct 2011 01:50:26 +0000 (-0400)
Subject: gthread/: fix up declarations
X-Git-Tag: 2.31.0~39
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a6d9cf3380a3be9ea518227cba3c571726bb99c6;p=platform%2Fupstream%2Fglib.git

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.
---

diff --git a/glib/deprecated/gthread.h b/glib/deprecated/gthread.h
index 7a5c327..6dc0b7f 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 7ff1c5b..4cf4df0 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 b0480ea..fd03b1d 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)