Add some more deprecation guards to shut up gtk-doc

diff --git a/glib/deprecated/gcache.h b/glib/deprecated/gcache.h
index 1886f6b..5865978 100644 (file)
--- a/glib/deprecated/gcache.h
+++ b/glib/deprecated/gcache.h
@@ -33,6 +33,8 @@
 
 G_BEGIN_DECLS
 
+#ifndef G_DISABLE_DEPRECATED
+
 typedef struct _GCache          GCache;
 
 typedef gpointer        (*GCacheNewFunc)        (gpointer       key);
@@ -66,6 +68,8 @@ void     g_cache_value_foreach (GCache            *cache,
                                 GHFunc             func,
                                 gpointer           user_data);
 
+#endif
+
 G_END_DECLS
 
 #endif /* __G_CACHE_H__ */

diff --git a/glib/deprecated/gmain.h b/glib/deprecated/gmain.h
index c2e31ff..453699d 100644 (file)
--- a/glib/deprecated/gmain.h
+++ b/glib/deprecated/gmain.h
@@ -33,6 +33,8 @@
 
 G_BEGIN_DECLS
 
+#ifndef G_DISABLE_DEPRECATED
+
 /* ============== Compat main loop stuff ================== */
 
 /**
@@ -130,6 +132,7 @@ G_BEGIN_DECLS
  */
 #define g_main_set_poll_func(func)  g_main_context_set_poll_func (NULL, func)
 
+#endif
 
 G_END_DECLS
 

diff --git a/glib/deprecated/gthread.h b/glib/deprecated/gthread.h
index 9d1c685..dc631e6 100644 (file)
--- a/glib/deprecated/gthread.h
+++ b/glib/deprecated/gthread.h
@@ -33,6 +33,8 @@
 
 G_BEGIN_DECLS
 
+#ifndef G_DISABLE_DEPRECATED
+
 typedef enum
 {
   G_THREAD_PRIORITY_LOW,
@@ -280,6 +282,8 @@ gboolean        g_cond_timed_wait       (GCond          *cond,
                                          GMutex         *mutex,
                                          GTimeVal       *timeval);
 
+#endif
+
 G_END_DECLS
 
 #endif /* __G_DEPRECATED_THREAD_H__ */