Remove all uses of G_CONST_RETURN

[platform/upstream/glib.git] / glib / gquark.h

diff --git a/glib/gquark.h b/glib/gquark.h
index 08dd9e4..324c956 100644 (file)
--- a/glib/gquark.h
+++ b/glib/gquark.h
@@ -21,13 +21,17 @@
  * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GLib Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/. 
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#error "Only <glib.h> can be included directly."
+#endif
+
 #ifndef __G_QUARK_H__
 #define __G_QUARK_H__
 
-#include <gtypes.h>
+#include <glib/gtypes.h>
 
 G_BEGIN_DECLS
 
@@ -35,12 +39,14 @@ typedef guint32 GQuark;
 
 /* Quarks (string<->id association)
  */
-GQuark    g_quark_try_string            (const gchar    *string);
-GQuark    g_quark_from_static_string    (const gchar    *string);
-GQuark    g_quark_from_string           (const gchar    *string);
-gchar*    g_quark_to_string             (GQuark          quark) G_GNUC_CONST;
+GQuark                g_quark_try_string         (const gchar *string);
+GQuark                g_quark_from_static_string (const gchar *string);
+GQuark                g_quark_from_string        (const gchar *string);
+const gchar *         g_quark_to_string          (GQuark       quark) G_GNUC_CONST;
+
+const gchar *         g_intern_string            (const gchar *string);
+const gchar *         g_intern_static_string     (const gchar *string);
 
 G_END_DECLS
 
 #endif /* __G_QUARK_H__ */
-