From 17b9b43a7a736a0fa85c354fdb4f0686d15da604 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@src.gnome.org>
Date: Wed, 28 Jan 2009 14:09:18 +0000
Subject: [PATCH] Add G_GOFFSET_FORMAT and friends. Bug #563141.

	* configure.in:
	* docs/reference/glib/glib-sections.txt:
	* docs/reference/macros_misc.sgml:
	* docs/reference/glib/tmpl/types.sgml: Add
	G_GOFFSET_FORMAT and friends. Bug #563141.

svn path=/trunk/; revision=7834
---
 ChangeLog                                 |  8 ++++++++
 configure.in                              |  4 ++++
 docs/reference/glib/glib-sections.txt     |  3 +++
 docs/reference/glib/tmpl/macros_misc.sgml | 21 ++++++++++++++++++++-
 docs/reference/glib/tmpl/types.sgml       | 12 +++++++++++-
 5 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4829dcae9..af9c2ca41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-01-27  Christian Persch  <chpe@gnome.org>
+
+	* configure.in:
+	* docs/reference/glib/glib-sections.txt:
+	* docs/reference/macros_misc.sgml:
+	* docs/reference/glib/tmpl/types.sgml: Add
+	G_GOFFSET_FORMAT and friends. Bug #563141.
+
 2009-01-23  Stefan Kost  <ensonic@users.sf.net>
 
 	* docs/reference/glib/Makefile.am:
diff --git a/configure.in b/configure.in
index 5fd985fce..4eae32a86 100644
--- a/configure.in
+++ b/configure.in
@@ -2772,6 +2772,10 @@ typedef gint64 goffset;
 #define G_MINOFFSET	G_MININT64
 #define G_MAXOFFSET	G_MAXINT64
 
+#define G_GOFFSET_MODIFIER      G_GINT64_MODIFIER
+#define G_GOFFSET_FORMAT        G_GINT64_FORMAT
+#define G_GOFFSET_CONSTANT(val) G_GINT64_CONSTANT(val)
+
 _______EOF
 
 	if test -z "$glib_unknown_void_p"; then
diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt
index e7e09ed69..67250b325 100644
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -40,6 +40,7 @@ gdouble
 gsize
 gssize
 goffset
+G_GOFFSET_CONSTANT
 
 <SUBSECTION Private>
 GLIB_SIZEOF_VOID_P
@@ -365,6 +366,8 @@ G_GUINT64_FORMAT
 G_GSIZE_MODIFIER
 G_GSIZE_FORMAT
 G_GSSIZE_FORMAT
+G_GOFFSET_MODIFIER
+G_GOFFSET_FORMAT
 
 <SUBSECTION Private>
 GLIB_VAR
diff --git a/docs/reference/glib/tmpl/macros_misc.sgml b/docs/reference/glib/tmpl/macros_misc.sgml
index 84e2a839c..0802c07fe 100644
--- a/docs/reference/glib/tmpl/macros_misc.sgml
+++ b/docs/reference/glib/tmpl/macros_misc.sgml
@@ -523,7 +523,7 @@ printing values of type #guint32. See also #G_GINT16_FORMAT.
 <!-- ##### MACRO G_GINT64_MODIFIER ##### -->
 <para>
 The platform dependent length modifier for conversion specifiers for scanning
-and printing values of type #gint64 or #guint64. It is a string literal, 
+and printing values of type #gint64 or #guint64. It is a string literal.
 </para>
 
 <note>
@@ -600,3 +600,22 @@ printing values of type #gssize. See also #G_GINT16_FORMAT.
 @Since: 2.6
 
 
+<!-- ##### MACRO G_GOFFSET_MODIFIER ##### -->
+<para>
+The platform dependent length modifier for conversion specifiers for scanning
+and printing values of type #goffset. It is a string literal. See also
+#G_GINT64_MODIFIER.
+</para>
+
+@Since: 2.20
+
+
+
+<!-- ##### MACRO G_GOFFSET_FORMAT ##### -->
+<para>
+This is the platform dependent conversion specifier for scanning and
+printing values of type #goffset. See also #G_GINT64_FORMAT.
+</para>
+
+Since: 2.20
+
diff --git a/docs/reference/glib/tmpl/types.sgml b/docs/reference/glib/tmpl/types.sgml
index 0f2b37ce5..9befc74a2 100644
--- a/docs/reference/glib/tmpl/types.sgml
+++ b/docs/reference/glib/tmpl/types.sgml
@@ -217,7 +217,7 @@ To print or scan values of this type, use
 This macro is used to insert 64-bit integer literals into the source code.
 </para>
 
-@val: a literal integer value, e.g. 0x1d636b02300a7aa7U.
+@val: a literal integer value, e.g. 0x1d636b02300a7aa7.
 
 
 <!-- ##### MACRO G_GUINT64_CONSTANT ##### -->
@@ -276,3 +276,13 @@ C99 type off64_t.
 Since: 2.14
 
 
+<!-- ##### MACRO G_GOFFSET_CONSTANT ##### -->
+<para>
+This macro is used to insert #goffset 64-bit integer literals into the source code.
+See also #G_GINT64_CONSTANT.
+</para>
+
+@val: a literal integer value, e.g. 0x1d636b02300a7aa7.
+Since: 2.20
+
+