X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=glib%2Fgquark.h;h=87fb713d28bcdf2fe27a3eb22e54ecf3d6897c12;hb=904ec5534cdc45d9b90e86a467e97af3b1bdd66d;hp=a0cbe2fd72c8c6c97f16e6a806ec8ec62781cb49;hpb=73ca8b47540d005d5227c03aac143d6780da654c;p=platform%2Fupstream%2Fglib.git
diff --git a/glib/gquark.h b/glib/gquark.h
index a0cbe2f..87fb713 100644
--- a/glib/gquark.h
+++ b/glib/gquark.h
@@ -12,9 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see .
*/
/*
@@ -24,13 +22,13 @@
* GLib at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only can be included directly."
-#endif
-
#ifndef __G_QUARK_H__
#define __G_QUARK_H__
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#error "Only can be included directly."
+#endif
+
#include
G_BEGIN_DECLS
@@ -39,13 +37,31 @@ typedef guint32 GQuark;
/* Quarks (string<->id association)
*/
+GLIB_AVAILABLE_IN_ALL
GQuark g_quark_try_string (const gchar *string);
+GLIB_AVAILABLE_IN_ALL
GQuark g_quark_from_static_string (const gchar *string);
+GLIB_AVAILABLE_IN_ALL
GQuark g_quark_from_string (const gchar *string);
-G_CONST_RETURN gchar* g_quark_to_string (GQuark quark) G_GNUC_CONST;
+GLIB_AVAILABLE_IN_ALL
+const gchar * g_quark_to_string (GQuark quark) G_GNUC_CONST;
+
+#define G_DEFINE_QUARK(QN, q_n) \
+GQuark \
+q_n##_quark (void) \
+{ \
+ static GQuark q; \
+ \
+ if G_UNLIKELY (q == 0) \
+ q = g_quark_from_static_string (#QN); \
+ \
+ return q; \
+}
-G_CONST_RETURN gchar* g_intern_string (const gchar *string);
-G_CONST_RETURN gchar* g_intern_static_string (const gchar *string);
+GLIB_AVAILABLE_IN_ALL
+const gchar * g_intern_string (const gchar *string);
+GLIB_AVAILABLE_IN_ALL
+const gchar * g_intern_static_string (const gchar *string);
G_END_DECLS