* glib_pre1.h:
        * glib_pre2.h:
        * glib.h: this file now gets concatenated by makeglib_h from
        glib_pre1.h and glib_pre2.h to merge in glibconfig.h wich got
        created by configure (done by Jay Painter).

        * glib_pre2.h: the g_assert*() and g_return_*_fail() macros
        are wrapped by G_STMT_START and G_STMT_END now, to avoid conflicts
        when used within if (...) g_macro(); else ... conditionals.
Gtk+:
        * fixed some compiler errors, because g_return_if_fail() wasn't used
        with a trailing semicolon in some places. fixed few other warnings also.

-timj
This commit is contained in:
Tim Janik
1997-12-10 22:43:24 +00:00
parent 68269a3f2a
commit 8a6dea2d55
15 changed files with 100 additions and 28 deletions

View File

@ -415,7 +415,7 @@ GdkWindow*
gdk_window_ref (GdkWindow *window)
{
GdkWindowPrivate *private = (GdkWindowPrivate *)window;
g_return_if_fail (window != NULL);
g_return_val_if_fail (window != NULL, NULL);
private->ref_count += 1;
return window;

View File

@ -415,7 +415,7 @@ GdkWindow*
gdk_window_ref (GdkWindow *window)
{
GdkWindowPrivate *private = (GdkWindowPrivate *)window;
g_return_if_fail (window != NULL);
g_return_val_if_fail (window != NULL, NULL);
private->ref_count += 1;
return window;