[glib] Revert "Deprecate G_CONST_RETURN"

[Emmanuele Bassi <ebassi src gnome org>]

commit 0c1acc7e741a01bf37d4c5f7a97ba1661f25d36a
Author: Emmanuele Bassi <ebassi linux intel com>
Date:   Tue Mar 15 09:02:08 2011 +0000

    Revert "Deprecate G_CONST_RETURN"
    
    This reverts commit a7fc7909dad9b88e8b2d1c6cde801e8888bdfc36.
    
    The deprecations was not discussed except on Bugzilla:
    
    https://bugzilla.gnome.org/show_bug.cgi?id=644611

 docs/reference/glib/tmpl/macros.sgml |    5 ++---
 glib/gmacros.h                       |    2 --
 2 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/docs/reference/glib/tmpl/macros.sgml b/docs/reference/glib/tmpl/macros.sgml
index cf411ee..7f40eb3 100644
--- a/docs/reference/glib/tmpl/macros.sgml
+++ b/docs/reference/glib/tmpl/macros.sgml
@@ -227,6 +227,5 @@ turn it off. This macro should only be used for return values and for
 <emphasis>in</emphasis> parameters. 
 </para>
 
- Deprecated: 2.30: API providers should replace all existing uses with
-  <literal>const</literal> and API consumers should adjust their code
-  accordingly.
+
+
diff --git a/glib/gmacros.h b/glib/gmacros.h
index 538ded6..9f9c25d 100644
--- a/glib/gmacros.h
+++ b/glib/gmacros.h
@@ -250,13 +250,11 @@
  * (usually char*) are const or not.  Don't try using this feature for
  * functions with C++ linkage.
  */
-#ifndef G_DISABLE_DEPRECATED
 #ifdef G_DISABLE_CONST_RETURNS
 #define G_CONST_RETURN
 #else
 #define G_CONST_RETURN const
 #endif
-#endif
 
 /*
  * The G_LIKELY and G_UNLIKELY macros let the programmer give hints to