projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unicode: Update to unicode 7.0.0
[platform/upstream/glib.git]
/
glib
/
gquark.h
diff --git
a/glib/gquark.h
b/glib/gquark.h
index
a0cbe2f
..
87fb713
100644
(file)
--- 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
* 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 <http://www.gnu.org/licenses/>.
*/
/*
*/
/*
@@
-24,13
+22,13
@@
* 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__
#ifndef __G_QUARK_H__
#define __G_QUARK_H__
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#error "Only <glib.h> can be included directly."
+#endif
+
#include <glib/gtypes.h>
G_BEGIN_DECLS
#include <glib/gtypes.h>
G_BEGIN_DECLS
@@
-39,13
+37,31
@@
typedef guint32 GQuark;
/* Quarks (string<->id association)
*/
/* Quarks (string<->id association)
*/
+GLIB_AVAILABLE_IN_ALL
GQuark g_quark_try_string (const gchar *string);
GQuark g_quark_try_string (const gchar *string);
+GLIB_AVAILABLE_IN_ALL
GQuark g_quark_from_static_string (const gchar *string);
GQuark g_quark_from_static_string (const gchar *string);
+GLIB_AVAILABLE_IN_ALL
GQuark g_quark_from_string (const gchar *string);
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
G_END_DECLS