From fd772fbe95fd70a7f34401c85b048ed1460af898 Mon Sep 17 00:00:00 2001
From: Ryan Lortie <desrt@desrt.ca>
Date: Mon, 13 Jun 2011 09:27:41 -0400
Subject: [PATCH] Formally deprecate G_CONST_RETURN

---
 glib/gmacros.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/glib/gmacros.h b/glib/gmacros.h
index aed6d09..f67fbd5 100644
--- a/glib/gmacros.h
+++ b/glib/gmacros.h
@@ -247,15 +247,14 @@
 #  define G_STMT_END    while (0)
 #endif
 
-/* Allow the app programmer to select whether or not return values
- * (usually char*) are const or not.  Don't try using this feature for
- * functions with C++ linkage.
- */
+/* Deprecated -- do not use. */
+#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 
-- 
2.7.4