Make G_DISABLE_DEPRECATED work again for wholly deprecated headers

Patch by Milan Crha,

https://bugzilla.gnome.org/show_bug.cgi?id=688169

diff --git a/glib/glib.h b/glib/glib.h
index 77abf23..ce7447e 100644 (file)
--- a/glib/glib.h
+++ b/glib/glib.h
@@ -100,12 +100,14 @@
 #include <glib/gwin32.h>
 #endif
 
+#ifndef G_DISABLE_DEPRECATED
 #include <glib/deprecated/gallocator.h>
 #include <glib/deprecated/gcache.h>
 #include <glib/deprecated/gcompletion.h>
 #include <glib/deprecated/gmain.h>
 #include <glib/deprecated/grel.h>
 #include <glib/deprecated/gthread.h>
+#endif /* G_DISABLE_DEPRECATED */
 
 #undef __GLIB_H_INSIDE__