From 04c96e8fa3004ea674dcfa39cf43979bf67f2aa6 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 2 Dec 2003 01:31:43 +0000 Subject: 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. --- glib/gtypes.h | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'glib/gtypes.h') 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 */ - -#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; -- cgit v1.2.1