GLib:

        * 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

15 files changed, 100 insertions, 28 deletions

diff --git a/ChangeLog b/ChangeLog
index 77e29e7fcb..805bda7fa5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 10 23:40:03 1997  Tim Janik  <timj@psynet.net>
+
+	* fixed some compiler errors, because g_return_if_fail() wasn't used
+	with a trailing semicolon in some places. fixed few other warnings also.
+
 Tue Dec  9 Owen Taylor <owt1@cornell.edu>
 	* configure changes: (configure.in, glib/configure.in)
 	Change test ! `...` to test -z `...`
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 77e29e7fcb..805bda7fa5 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Wed Dec 10 23:40:03 1997  Tim Janik  <timj@psynet.net>
+
+	* fixed some compiler errors, because g_return_if_fail() wasn't used
+	with a trailing semicolon in some places. fixed few other warnings also.
+
 Tue Dec  9 Owen Taylor <owt1@cornell.edu>
 	* configure changes: (configure.in, glib/configure.in)
 	Change test ! `...` to test -z `...`
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 77e29e7fcb..805bda7fa5 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Wed Dec 10 23:40:03 1997  Tim Janik  <timj@psynet.net>
+
+	* fixed some compiler errors, because g_return_if_fail() wasn't used
+	with a trailing semicolon in some places. fixed few other warnings also.
+
 Tue Dec  9 Owen Taylor <owt1@cornell.edu>
 	* configure changes: (configure.in, glib/configure.in)
 	Change test ! `...` to test -z `...`
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 77e29e7fcb..805bda7fa5 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Wed Dec 10 23:40:03 1997  Tim Janik  <timj@psynet.net>
+
+	* fixed some compiler errors, because g_return_if_fail() wasn't used
+	with a trailing semicolon in some places. fixed few other warnings also.
+
 Tue Dec  9 Owen Taylor <owt1@cornell.edu>
 	* configure changes: (configure.in, glib/configure.in)
 	Change test ! `...` to test -z `...`
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 77e29e7fcb..805bda7fa5 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Wed Dec 10 23:40:03 1997  Tim Janik  <timj@psynet.net>
+
+	* fixed some compiler errors, because g_return_if_fail() wasn't used
+	with a trailing semicolon in some places. fixed few other warnings also.
+
 Tue Dec  9 Owen Taylor <owt1@cornell.edu>
 	* configure changes: (configure.in, glib/configure.in)
 	Change test ! `...` to test -z `...`
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 77e29e7fcb..805bda7fa5 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Wed Dec 10 23:40:03 1997  Tim Janik  <timj@psynet.net>
+
+	* fixed some compiler errors, because g_return_if_fail() wasn't used
+	with a trailing semicolon in some places. fixed few other warnings also.
+
 Tue Dec  9 Owen Taylor <owt1@cornell.edu>
 	* configure changes: (configure.in, glib/configure.in)
 	Change test ! `...` to test -z `...`
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 77e29e7fcb..805bda7fa5 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Wed Dec 10 23:40:03 1997  Tim Janik  <timj@psynet.net>
+
+	* fixed some compiler errors, because g_return_if_fail() wasn't used
+	with a trailing semicolon in some places. fixed few other warnings also.
+
 Tue Dec  9 Owen Taylor <owt1@cornell.edu>
 	* configure changes: (configure.in, glib/configure.in)
 	Change test ! `...` to test -z `...`
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 88eb592651..473daa58e3 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -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;
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 88eb592651..473daa58e3 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -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;
diff --git a/glib/ChangeLog b/glib/ChangeLog
index b119426ca6..c0feaca0db 100644
--- a/glib/ChangeLog
+++ b/glib/ChangeLog
@@ -1,3 +1,15 @@
+Wed Dec 10 23:27:20 1997  Tim Janik  <timj@psynet.net>
+
+	* 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.
+	
 Tue Dec 17 13:14:07 1996  Peter Mattis  <pmattis@charnley.HIP.Berkeley.EDU>
 
 	* glib.h: Changed 'g_return_if_fail' and 'g_return_val_if_fail' to
diff --git a/glib/glib_pre2.h b/glib/glib_pre2.h
index 9133d0017e..102066d569 100644
--- a/glib/glib_pre2.h
+++ b/glib/glib_pre2.h
@@ -130,31 +130,57 @@
     ((type *) g_mem_chunk_alloc (chunk))
 
 
+#define g_string(x) #x
+
+
+/* Provide simple macro statement wrappers (adapted from Pearl):
+ *  G_STMT_START { statements; } G_STMT_END;
+ *  can be used as a single statement, as in
+ *  if (x) G_STMT_START { ... } G_STMT_END; else ...
+ *
+ *  For gcc we will wrap the statements within `({' and `})' braces.
+ *  For SunOS they will be wrapped within `if (1)' and `else (void)0',
+ *  and otherwise within `do' and `while (0)'.
+ */
+#if !(defined (G_STMT_START) && defined (G_STMT_END))
+#  if defined (__GNUC__) && !defined (__STRICT_ANSI__) && !defined (__cplusplus)
+#    define G_STMT_START	(void)(
+#    define G_STMT_END		)
+#  else
+#    if (defined (sun) || defined (__sun__))
+#      define G_STMT_START	if (1)
+#      define G_STMT_END	else (void)0
+#    else
+#      define G_STMT_START	do
+#      define G_STMT_END	while (0)
+#    endif
+#  endif
+#endif
+
+
 /* Provide macros for error handling. The "assert" macros will
- *  exit on failur. The "return" macros will exit the current
+ *  exit on failure. The "return" macros will exit the current
  *  function. Two different definitions are given for the macros
  *  in order to support gcc's __PRETTY_FUNCTION__ capability.
  */
 
-#define g_string(x) #x
-
 #ifdef __GNUC__
 
-#define g_assert(expr) \
+#define g_assert(expr)			G_STMT_START{\
      if (!(expr))                                    \
        g_error ("file %s: line %d (%s): \"%s\"",     \
 		__FILE__,                            \
 		__LINE__,                            \
 		__PRETTY_FUNCTION__,                 \
-		#expr)
+		#expr);			}G_STMT_END
 
-#define g_assert_not_reached() \
+#define g_assert_not_reached()		G_STMT_START{		      \
      g_error ("file %s: line %d (%s): \"should not be reached\"",     \
 	      __FILE__,                                               \
 	      __LINE__,                                               \
-	      __PRETTY_FUNCTION__)
+	      __PRETTY_FUNCTION__);	}G_STMT_END
 
-#define g_return_if_fail(expr) \
+#define g_return_if_fail(expr)		G_STMT_START{	       \
      if (!(expr))                                              \
        {                                                       \
          g_warning ("file %s: line %d (%s): \"%s\"",           \
@@ -163,9 +189,9 @@
 		    __PRETTY_FUNCTION__,                       \
 		    #expr);                                    \
          return;                                               \
-       }
+       };				}G_STMT_END
 
-#define g_return_val_if_fail(expr,val) \
+#define g_return_val_if_fail(expr,val)	G_STMT_START{	       \
      if (!(expr))                                              \
        {                                                       \
          g_warning ("file %s: line %d (%s): \"%s\"",           \
@@ -174,23 +200,23 @@
 		    __PRETTY_FUNCTION__,                       \
 		    #expr);                                    \
          return val;                                           \
-       }
+       };				}G_STMT_END
 
 #else /* __GNUC__ */
 
-#define g_assert(expr) \
+#define g_assert(expr)			G_STMT_START{\
      if (!(expr))                                    \
        g_error ("file %s: line %d: \"%s\"",          \
 		__FILE__,                            \
 		__LINE__,                            \
-		#expr)
+		#expr);			}G_STMT_END
 
-#define g_assert_not_reached() \
+#define g_assert_not_reached()		G_STMT_START{		      \
      g_error ("file %s: line %d: \"should not be reached\"",          \
 	      __FILE__,                                               \
-	      __LINE__)
+	      __LINE__);		}G_STMT_END
 
-#define g_return_if_fail(expr) \
+#define g_return_if_fail(expr)		G_STMT_START{	 \
      if (!(expr))                                        \
        {                                                 \
          g_warning ("file %s: line %d: \"%s\"",          \
@@ -198,9 +224,9 @@
 		    __LINE__,                            \
 		    #expr);                              \
 	 return;				         \
-       }
+       };				}G_STMT_END
 
-#define g_return_val_if_fail(expr, val) \
+#define g_return_val_if_fail(expr, val)	G_STMT_START{	 \
      if (!(expr))                                        \
        {                                                 \
          g_warning ("file %s: line %d: \"%s\"",          \
@@ -208,7 +234,7 @@
 		    __LINE__,                            \
 		    #expr);                              \
 	 return val;	 			         \
-       }
+       };				}G_STMT_END
 
 #endif /* __GNUC__ */
 
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index efc1b8f996..c55ade8a51 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -887,10 +887,9 @@ gtk_handle_current_idles ()
 static void
 gtk_handle_idle ()
 {
-  GtkIdleFunction *idlef;
-  
   /* Caller must already have called gtk_handle_current_idles if
-     necessary */
+   * necessary
+   */
   g_assert (current_idles == NULL);
   
   if (idle_functions)
diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index 89a2b4ea96..6c975757c5 100644
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -749,8 +749,7 @@ gtk_selection_request (GtkWidget *widget,
 	  continue;
 	}
 
-      g_return_val_if_fail ((data.format >= 8) 
-			    && (data.format % 8 == 0), FALSE)
+      g_return_val_if_fail ((data.format >= 8) && (data.format % 8 == 0), FALSE);
 
       items = (data.length + data.format/8 - 1) / (data.format/8);
 
diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index 7d3995a4a9..4a94de0843 100644
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -476,7 +476,7 @@ gtk_text_set_point (GtkText *text,
 {
   g_return_if_fail (text != NULL);
   g_return_if_fail (GTK_IS_TEXT (text));
-  g_return_if_fail (index >= 0 && index <= TEXT_LENGTH (text))
+  g_return_if_fail (index >= 0 && index <= TEXT_LENGTH (text));
 
   text->point = find_mark (text, index);
 }
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 90cfc844b9..4fc8dd5e33 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -741,6 +741,7 @@ gtk_window_key_release_event (GtkWidget   *widget,
   g_return_val_if_fail (event != NULL, FALSE);
 
   window = GTK_WINDOW (widget);
+  return_val = FALSE;
   if (window->focus_widget)
     return_val = gtk_widget_event (window->focus_widget, (GdkEvent*) event);
 
@@ -834,7 +835,7 @@ gtk_window_style_set_event (GtkWidget *widget,
   GdkAtom realtype;
   gint retfmt, retlen;
   GdkColor *data, *stylecolors;
-  int i = 0, j;
+  int i = 0;
   GdkColormap *widget_cmap;
   
   atom_default_colors = gdk_atom_intern("_GTK_DEFAULT_COLORS", FALSE);