From 04c96e8fa3004ea674dcfa39cf43979bf67f2aa6 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 2 Dec 2003 01:31:43 +0000 Subject: [PATCH] Fix for #103710, Mark Jones: Tue Dec 2 02:29:41 2003 Matthias Clasen 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. --- ChangeLog | 7 +++ ChangeLog.pre-2-10 | 7 +++ ChangeLog.pre-2-12 | 7 +++ ChangeLog.pre-2-4 | 7 +++ ChangeLog.pre-2-6 | 7 +++ ChangeLog.pre-2-8 | 7 +++ configure.in | 4 -- docs/reference/ChangeLog | 5 ++ docs/reference/glib/glib-sections.txt | 15 ++++++ docs/reference/glib/tmpl/limits.sgml | 72 +++++++++++++++++++++++++++ glib/gtypes.h | 24 +++++---- 11 files changed, 149 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e1eadaa0..bb6681bbd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Dec 2 02:29:41 2003 Matthias Clasen + + 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 * glib/gstrfuncs.c (g_strconcat): handle NULL arguments diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3e1eadaa0..bb6681bbd 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Tue Dec 2 02:29:41 2003 Matthias Clasen + + 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 * glib/gstrfuncs.c (g_strconcat): handle NULL arguments diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 3e1eadaa0..bb6681bbd 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,10 @@ +Tue Dec 2 02:29:41 2003 Matthias Clasen + + 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 * glib/gstrfuncs.c (g_strconcat): handle NULL arguments diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3e1eadaa0..bb6681bbd 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Tue Dec 2 02:29:41 2003 Matthias Clasen + + 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 * glib/gstrfuncs.c (g_strconcat): handle NULL arguments diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3e1eadaa0..bb6681bbd 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Tue Dec 2 02:29:41 2003 Matthias Clasen + + 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 * glib/gstrfuncs.c (g_strconcat): handle NULL arguments diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3e1eadaa0..bb6681bbd 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Tue Dec 2 02:29:41 2003 Matthias Clasen + + 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 * glib/gstrfuncs.c (g_strconcat): handle NULL arguments diff --git a/configure.in b/configure.in index 91d87c5d5..d9ffa442b 100644 --- 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 320d5c035..fc5bc8370 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,8 @@ +Tue Dec 2 02:31:15 2003 Matthias Clasen + + * 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 * 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 eb26ee2f8..d72b76dd9 100644 --- a/docs/reference/glib/glib-sections.txt +++ b/docs/reference/glib/glib-sections.txt @@ -63,6 +63,21 @@ G_MINLONG G_MAXLONG G_MAXULONG + +G_MININT8 +G_MAXINT8 +G_MAXUINT8 + + +G_MININT16 +G_MAXINT16 +G_MAXUINT16 + + +G_MININT32 +G_MAXINT32 +G_MAXUINT32 + G_MININT64 G_MAXINT64 diff --git a/docs/reference/glib/tmpl/limits.sgml b/docs/reference/glib/tmpl/limits.sgml index 7d3d179f0..34515e117 100644 --- 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. + + +The minimum value which can be held in a #gint8. + + +@Since: 2.4 + + + + +The maximum value which can be held in a #gint8. + + +@Since: 2.4 + + + + +The maximum value which can be held in a #guint8. + + +@Since: 2.4 + + + + +The minimum value which can be held in a #gint16. + + +@Since: 2.4 + + + + +The maximum value which can be held in a #gint16. + + +@Since: 2.4 + + + + +The maximum value which can be held in a #guint16. + + +@Since: 2.4 + + + + +The minimum value which can be held in a #gint32. + + +@Since: 2.4 + + + + +The maximum value which can be held in a #gint32. + + +@Since: 2.4 + + + + +The maximum value which can be held in a #guint32. + + +@Since: 2.4 + + The minimum value which can be held in a #gint64. diff --git a/glib/gtypes.h b/glib/gtypes.h index 237733d59..a7ec35876 100644 --- 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 */ +/* 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) -#if 0 -#ifdef HAVE_LONG_DOUBLE -typedef long double gldouble; -#else /* HAVE_LONG_DOUBLE */ -typedef double gldouble; -#endif /* HAVE_LONG_DOUBLE */ -#endif /* 0 */ +#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;