Fix for #103710, Mark Jones:

Tue Dec  2 02:29:41 2003  Matthias Clasen  <maclas@gmx.de>

	Fix for #103710, Mark Jones:

	* glib/gtypes.h (G_MAXINT64): Define G_{MIN,MAX,MAXU}INT{8,16,32,64}.
	* configure.in: Don't put G_{MIN,MAX,MAXU}INT64 in glibconfig.h.

diff --git a/ChangeLog b/ChangeLog
index 3e1eada..bb6681b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Dec  2 02:29:41 2003  Matthias Clasen  <maclas@gmx.de>
+
+       Fix for #103710, Mark Jones:
+       
+       * glib/gtypes.h (G_MAXINT64): Define G_{MIN,MAX,MAXU}INT{8,16,32,64}.
+       * configure.in: Don't put G_{MIN,MAX,MAXU}INT64 in glibconfig.h.
+
 Thu Nov 27 17:04:08 2003  Tim Janik  <timj@gtk.org>
 
        * glib/gstrfuncs.c (g_strconcat): handle NULL arguments

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3e1eada..bb6681b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Tue Dec  2 02:29:41 2003  Matthias Clasen  <maclas@gmx.de>
+
+       Fix for #103710, Mark Jones:
+       
+       * glib/gtypes.h (G_MAXINT64): Define G_{MIN,MAX,MAXU}INT{8,16,32,64}.
+       * configure.in: Don't put G_{MIN,MAX,MAXU}INT64 in glibconfig.h.
+
 Thu Nov 27 17:04:08 2003  Tim Janik  <timj@gtk.org>
 
        * glib/gstrfuncs.c (g_strconcat): handle NULL arguments

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 3e1eada..bb6681b 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,10 @@
+Tue Dec  2 02:29:41 2003  Matthias Clasen  <maclas@gmx.de>
+
+       Fix for #103710, Mark Jones:
+       
+       * glib/gtypes.h (G_MAXINT64): Define G_{MIN,MAX,MAXU}INT{8,16,32,64}.
+       * configure.in: Don't put G_{MIN,MAX,MAXU}INT64 in glibconfig.h.
+
 Thu Nov 27 17:04:08 2003  Tim Janik  <timj@gtk.org>
 
        * glib/gstrfuncs.c (g_strconcat): handle NULL arguments

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3e1eada..bb6681b 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Tue Dec  2 02:29:41 2003  Matthias Clasen  <maclas@gmx.de>
+
+       Fix for #103710, Mark Jones:
+       
+       * glib/gtypes.h (G_MAXINT64): Define G_{MIN,MAX,MAXU}INT{8,16,32,64}.
+       * configure.in: Don't put G_{MIN,MAX,MAXU}INT64 in glibconfig.h.
+
 Thu Nov 27 17:04:08 2003  Tim Janik  <timj@gtk.org>
 
        * glib/gstrfuncs.c (g_strconcat): handle NULL arguments

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3e1eada..bb6681b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Tue Dec  2 02:29:41 2003  Matthias Clasen  <maclas@gmx.de>
+
+       Fix for #103710, Mark Jones:
+       
+       * glib/gtypes.h (G_MAXINT64): Define G_{MIN,MAX,MAXU}INT{8,16,32,64}.
+       * configure.in: Don't put G_{MIN,MAX,MAXU}INT64 in glibconfig.h.
+
 Thu Nov 27 17:04:08 2003  Tim Janik  <timj@gtk.org>
 
        * glib/gstrfuncs.c (g_strconcat): handle NULL arguments

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3e1eada..bb6681b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Tue Dec  2 02:29:41 2003  Matthias Clasen  <maclas@gmx.de>
+
+       Fix for #103710, Mark Jones:
+       
+       * glib/gtypes.h (G_MAXINT64): Define G_{MIN,MAX,MAXU}INT{8,16,32,64}.
+       * configure.in: Don't put G_{MIN,MAX,MAXU}INT64 in glibconfig.h.
+
 Thu Nov 27 17:04:08 2003  Tim Janik  <timj@gtk.org>
 
        * glib/gstrfuncs.c (g_strconcat): handle NULL arguments

diff --git a/configure.in b/configure.in
index 91d87c5..d9ffa44 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2017,10 +2017,6 @@ G_BEGIN_DECLS
 #define G_MAXLONG      $glib_Ml
 #define G_MAXULONG     $glib_Mul
 
-#define G_MININT64     G_GINT64_CONSTANT(0x8000000000000000)
-#define G_MAXINT64     G_GINT64_CONSTANT(0x7fffffffffffffff)
-#define G_MAXUINT64    G_GINT64_CONSTANT(0xffffffffffffffffU)
-
 _______EOF
 
 

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 320d5c0..fc5bc83 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec  2 02:31:15 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/tmpl/limits.sgml:
+       * glib/glib-sections.txt: Add G_{MIN,MAX,MAXU}INT{8,16,32}.
+
 Thu Nov  6 01:42:36 2003  Matthias Clasen  <maclas@gmx.de>
 
        * glib/glib-sections.txt: Add an i18n section.

diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt
index eb26ee2..d72b76d 100644 (file)
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -64,6 +64,21 @@ G_MAXLONG
 G_MAXULONG
 
 <SUBSECTION>
+G_MININT8
+G_MAXINT8
+G_MAXUINT8
+
+<SUBSECTION>
+G_MININT16
+G_MAXINT16
+G_MAXUINT16
+
+<SUBSECTION>
+G_MININT32
+G_MAXINT32
+G_MAXUINT32
+
+<SUBSECTION>
 G_MININT64
 G_MAXINT64
 G_MAXUINT64

diff --git a/docs/reference/glib/tmpl/limits.sgml b/docs/reference/glib/tmpl/limits.sgml
index 7d3d179..34515e1 100644 (file)
--- a/docs/reference/glib/tmpl/limits.sgml
+++ b/docs/reference/glib/tmpl/limits.sgml
@@ -78,6 +78,78 @@ The maximum value which can be held in a #gulong.
 
 
 
+<!-- ##### MACRO G_MININT8 ##### -->
+<para>
+The minimum value which can be held in a #gint8.
+</para>
+
+@Since: 2.4
+
+
+<!-- ##### MACRO G_MAXINT8 ##### -->
+<para>
+The maximum value which can be held in a #gint8.
+</para>
+
+@Since: 2.4
+
+
+<!-- ##### MACRO G_MAXUINT8 ##### -->
+<para>
+The maximum value which can be held in a #guint8.
+</para>
+
+@Since: 2.4
+
+
+<!-- ##### MACRO G_MININT16 ##### -->
+<para>
+The minimum value which can be held in a #gint16.
+</para>
+
+@Since: 2.4
+
+
+<!-- ##### MACRO G_MAXINT16 ##### -->
+<para>
+The maximum value which can be held in a #gint16.
+</para>
+
+@Since: 2.4
+
+
+<!-- ##### MACRO G_MAXUINT16 ##### -->
+<para>
+The maximum value which can be held in a #guint16.
+</para>
+
+@Since: 2.4
+
+
+<!-- ##### MACRO G_MININT32 ##### -->
+<para>
+The minimum value which can be held in a #gint32.
+</para>
+
+@Since: 2.4
+
+
+<!-- ##### MACRO G_MAXINT32 ##### -->
+<para>
+The maximum value which can be held in a #gint32.
+</para>
+
+@Since: 2.4
+
+
+<!-- ##### MACRO G_MAXUINT32 ##### -->
+<para>
+The maximum value which can be held in a #guint32.
+</para>
+
+@Since: 2.4
+
+
 <!-- ##### MACRO G_MININT64 ##### -->
 <para>
 The minimum value which can be held in a #gint64.

diff --git a/glib/gtypes.h b/glib/gtypes.h
index 237733d..a7ec358 100644 (file)
--- a/glib/gtypes.h
+++ b/glib/gtypes.h
@@ -52,16 +52,22 @@ typedef unsigned int    guint;
 typedef float   gfloat;
 typedef double  gdouble;
 
-/* HAVE_LONG_DOUBLE doesn't work correctly on all platforms.
- * Since gldouble isn't used anywhere, just disable it for now */
-
-#if 0
-#ifdef HAVE_LONG_DOUBLE
-typedef long double gldouble;
-#else /* HAVE_LONG_DOUBLE */
-typedef double gldouble;
-#endif /* HAVE_LONG_DOUBLE */
-#endif /* 0 */
+/* Define min and max constants for the fixed size numerical types */
+#define G_MININT8      ((gint8)  0x80)
+#define G_MAXINT8      ((gint8)  0x7f)
+#define G_MAXUINT8     ((guint8) 0xff)
+
+#define G_MININT16     ((gint16)  0x8000)
+#define G_MAXINT16     ((gint16)  0x7fff)
+#define G_MAXUINT16    ((guint16) 0xffff)
+
+#define G_MININT32     ((gint32)  0x80000000)
+#define G_MAXINT32     ((gint32)  0x7fffffff)
+#define G_MAXUINT32    ((guint32) 0xffffffff)
+
+#define G_MININT64     G_GINT64_CONSTANT(0x8000000000000000)
+#define G_MAXINT64     G_GINT64_CONSTANT(0x7fffffffffffffff)
+#define G_MAXUINT64    G_GINT64_CONSTANT(0xffffffffffffffffU)
 
 typedef void* gpointer;
 typedef const void *gconstpointer;