diff options
| author | Tim Janik <timj@gtk.org> | 2000-07-26 03:18:27 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 2000-07-26 03:18:27 +0000 |
| commit | cb2f0780515a11bd5ed8138cbf53428bb3c6d2ed (patch) | |
| tree | b9f82e280686e50d76dd47f59eb5028cc1b822c7 /glib | |
| parent | 623efc182c9c3a001aa4e4634c48840d8124aa82 (diff) | |
| download | glib-cb2f0780515a11bd5ed8138cbf53428bb3c6d2ed.tar.gz | |
include <stdlib.h> and <stddef.h> if STDC_HEADERS is defined.
Wed Jul 26 05:03:24 2000 Tim Janik <timj@gtk.org>
* acglib.m4 (GLIB_SIZEOF): include <stdlib.h> and <stddef.h> if
STDC_HEADERS is defined.
* glib.h:
* glibconfig.h: define gsize and gssize in terms of GLIB_SIZEOF_SIZE_T
* glib.h (g_return_if_reached): applied darin's fix for copy'n
paste error in the macro implementation.
Diffstat (limited to 'glib')
| -rw-r--r-- | glib/glib.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/glib/glib.h b/glib/glib.h index 1420ed6db..7f31ba9e0 100644 --- a/glib/glib.h +++ b/glib/glib.h @@ -55,6 +55,7 @@ * gint16, guint16 * gint32, guint32 * gint64, guint64 + * gssize, gsize * * It defines the G_BYTE_ORDER symbol to one of G_*_ENDIAN (see later in * this file). @@ -462,7 +463,7 @@ extern "C" { #define g_return_if_reached() G_STMT_START{ \ g_log (G_LOG_DOMAIN, \ G_LOG_LEVEL_CRITICAL, \ - "file %s: line %d (%s): assertion `%s' failed", \ + "file %s: line %d (%s): should not be reached", \ __FILE__, \ __LINE__, \ __PRETTY_FUNCTION__); \ @@ -506,7 +507,7 @@ extern "C" { #define g_return_if_reached() G_STMT_START{ \ g_log (G_LOG_DOMAIN, \ G_LOG_LEVEL_CRITICAL, \ - "file %s: line %d: assertion `%s' failed", \ + "file %s: line %d: should not be reached", \ __FILE__, \ __LINE__); \ return; }G_STMT_END @@ -568,8 +569,6 @@ typedef void* gpointer; typedef const void *gconstpointer; -typedef gint32 gssize; -typedef guint32 gsize; typedef guint32 GQuark; typedef gint32 GTime; |