Define G_GUINT64_CONSTANT in analogy to G_GINT64_CONSTANT. (#322568,

2005-12-02  Matthias Clasen  <mclasen@redhat.com>

	* configure.in: Define G_GUINT64_CONSTANT in analogy to
	G_GINT64_CONSTANT.  (#322568, Andrew Paprocki)

diff --git a/ChangeLog b/ChangeLog
index e1dfc60..500f365 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-12-02  Matthias Clasen  <mclasen@redhat.com>
 
+       * configure.in: Define G_GUINT64_CONSTANT in analogy to
+       G_GINT64_CONSTANT.  (#322568, Andrew Paprocki)
+
        * glib/gslice.c: Win32 portability fixes and C99ism removal,
        pointed out by Kazuki Iwamoto.  (#323052)
        

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e1dfc60..500f365 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2005-12-02  Matthias Clasen  <mclasen@redhat.com>
 
+       * configure.in: Define G_GUINT64_CONSTANT in analogy to
+       G_GINT64_CONSTANT.  (#322568, Andrew Paprocki)
+
        * glib/gslice.c: Win32 portability fixes and C99ism removal,
        pointed out by Kazuki Iwamoto.  (#323052)
        

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index e1dfc60..500f365 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,5 +1,8 @@
 2005-12-02  Matthias Clasen  <mclasen@redhat.com>
 
+       * configure.in: Define G_GUINT64_CONSTANT in analogy to
+       G_GINT64_CONSTANT.  (#322568, Andrew Paprocki)
+
        * glib/gslice.c: Win32 portability fixes and C99ism removal,
        pointed out by Kazuki Iwamoto.  (#323052)
        

diff --git a/configure.in b/configure.in
index fa2f964..468d95f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -32,7 +32,7 @@ m4_define([glib_interface_age], [0])
 m4_define([glib_binary_age],
           [m4_eval(100 * glib_minor_version + glib_micro_version)])
 m4_define([glib_version],
-          [glib_major_version.glib_minor_version.glib_micro_version])
+          [glib_major_version.glib_minor_version.glib_micro_version.cvs20051202])
 
 # libtool version related macros
 m4_define([glib_lt_release], [glib_major_version.glib_minor_version])
@@ -2224,6 +2224,7 @@ ${glib_extension}typedef signed $gint64 gint64;
 ${glib_extension}typedef unsigned $gint64 guint64;
 
 #define G_GINT64_CONSTANT(val) $gint64_constant
+#define G_GUINT64_CONSTANT(val)        $guint64_constant
 _______EOF
 
        if test x$gint64_format != x ; then
@@ -2547,6 +2548,7 @@ $ac_cv_sizeof_int)
   guint64_format='"u"'
   glib_extension=
   gint64_constant='(val)'
+  guint64_constant='(val)'
   ;;
 $ac_cv_sizeof_long)
   gint64=long
@@ -2555,6 +2557,7 @@ $ac_cv_sizeof_long)
   guint64_format='"lu"'
   glib_extension=
   gint64_constant='(val##L)'
+  guint64_constant='(val##UL)'
   ;;
 $ac_cv_sizeof_long_long)
   gint64='long long'
@@ -2565,6 +2568,7 @@ $ac_cv_sizeof_long_long)
   fi
   glib_extension='G_GNUC_EXTENSION '
   gint64_constant='(G_GNUC_EXTENSION (val##LL))'
+  guint64_constant='(G_GNUC_EXTENSION (val##ULL))'
   ;;
 $ac_cv_sizeof___int64)
   gint64='__int64'
@@ -2575,6 +2579,7 @@ $ac_cv_sizeof___int64)
   fi
   glib_extension=
   gint64_constant='(val##i64)'
+  guint64_constant='(val##ui64)'
   ;;
 esac
 glib_size_t=$ac_cv_sizeof_size_t

diff --git a/docs/reference/glib/tmpl/types.sgml b/docs/reference/glib/tmpl/types.sgml
index 491e01d..987d021 100644 (file)
--- a/docs/reference/glib/tmpl/types.sgml
+++ b/docs/reference/glib/tmpl/types.sgml
@@ -194,6 +194,17 @@ This macro is used to insert 64-bit integer literals into the source code.
 @val: a literal integer value, e.g. 0x1d636b02300a7aa7U.
 
 
+<!-- ##### MACRO G_GUINT64_CONSTANT ##### -->
+<para>
+This macro is used to insert 64-bit unsigned integer literals into the 
+source code.
+</para>
+
+@val: a literal integer value, e.g. 0x1d636b02300a7aa7U.
+
+@Since: 2.10
+
+
 <!-- ##### TYPEDEF gfloat ##### -->
 <para>
 Corresponds to the standard C <type>float</type> type.