Fix the deprecation ifdefs.

* glib/src/thread.hg: Move the deprecation ifdefs to avoid affecting
  non-deprecated API.

2 files changed, 19 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 4f72d33c..bab29b79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-10-26  Murray Cumming  <murrayc@murrayc.com>
+
+  Fix the deprecation ifdefs.
+  
+	* glib/src/thread.hg: Move the deprecation ifdefs to avoid affecting 
+  non-deprecated API.
+
 2.31.0.1:
 
 2011-10-26  Murray Cumming  <murrayc@murrayc.com>
diff --git a/glib/src/thread.hg b/glib/src/thread.hg
index ed612a70..054667a2 100644
--- a/glib/src/thread.hg
+++ b/glib/src/thread.hg
@@ -60,12 +60,6 @@ enum { THREAD_PRIORITY_NORMAL = GLIBMM_MACRO_DEFINITION_THREAD_PRIORITY_NORMAL }
 #endif
 
 
-/** Initializer macro for Glib::StaticMutex.
- * @relates Glib::StaticMutex
- * @hideinitializer
- */
-#define GLIBMM_STATIC_MUTEX_INIT { G_STATIC_MUTEX_INIT }
-
 /** Initializer macro for Glib::StaticRecMutex.
  * @relates Glib::StaticRecMutex
  * @hideinitializer
@@ -118,6 +112,7 @@ void thread_init(GThreadFunctions* vtable = 0);
  */
 bool thread_supported();
 
+_DEPRECATE_IFDEF_END
 
 /** @defgroup Threads Threads
  * Thread abstraction; including threads, different mutexes,
@@ -131,7 +126,7 @@ enum TryLock { TRY_LOCK };
 class Mutex;
 class RecMutex;
 class RWLock;
-struct StaticMutex;
+
 struct StaticRecMutex;
 struct StaticRWLock;
 
@@ -312,6 +307,10 @@ class Thread::Exit
 Thread* wrap(GThread* gobject);
 
 
+_DEPRECATE_IFDEF_START
+
+struct StaticMutex;
+
 /** Like Glib::Mutex, but can be defined at compile time.
  * Use @c GLIBMM_STATIC_MUTEX_INIT to initialize a StaticMutex:
  * @code
@@ -339,6 +338,12 @@ struct StaticMutex
 #endif
 };
 
+/** Initializer macro for Glib::StaticMutex.
+ * @relates Glib::StaticMutex
+ * @hideinitializer
+ */
+#define GLIBMM_STATIC_MUTEX_INIT { G_STATIC_MUTEX_INIT }
+
 _DEPRECATE_IFDEF_END
 
 /** Represents a mutex (mutual exclusion).