Use "if (expr) { } else" as I meant to in the first place. The other form

	* glib/gmessages.h: Use "if (expr) { } else" as I meant to in the
	first place. The other form can trigger warnings in some compilers
	that suspect a ";" after "if (expr)" is an error.

diff --git a/ChangeLog b/ChangeLog
index 7b6fc3d..e14bd41 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-11  Darin Adler  <darin@bentspoon.com>
+
+       * glib/gmessages.h: Use "if (expr) { } else" as I meant to in the
+       first place. The other form can trigger warnings in some compilers
+       that suspect a ";" after "if (expr)" is an error.
+
 2002-02-11  Manish Singh  <yosh@gimp.org>
 
        * glib/gmessages.h: need statement terminators for the if clauses for

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 7b6fc3d..e14bd41 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2002-02-11  Darin Adler  <darin@bentspoon.com>
+
+       * glib/gmessages.h: Use "if (expr) { } else" as I meant to in the
+       first place. The other form can trigger warnings in some compilers
+       that suspect a ";" after "if (expr)" is an error.
+
 2002-02-11  Manish Singh  <yosh@gimp.org>
 
        * glib/gmessages.h: need statement terminators for the if clauses for

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7b6fc3d..e14bd41 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2002-02-11  Darin Adler  <darin@bentspoon.com>
+
+       * glib/gmessages.h: Use "if (expr) { } else" as I meant to in the
+       first place. The other form can trigger warnings in some compilers
+       that suspect a ";" after "if (expr)" is an error.
+
 2002-02-11  Manish Singh  <yosh@gimp.org>
 
        * glib/gmessages.h: need statement terminators for the if clauses for

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 7b6fc3d..e14bd41 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2002-02-11  Darin Adler  <darin@bentspoon.com>
+
+       * glib/gmessages.h: Use "if (expr) { } else" as I meant to in the
+       first place. The other form can trigger warnings in some compilers
+       that suspect a ";" after "if (expr)" is an error.
+
 2002-02-11  Manish Singh  <yosh@gimp.org>
 
        * glib/gmessages.h: need statement terminators for the if clauses for

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 7b6fc3d..e14bd41 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2002-02-11  Darin Adler  <darin@bentspoon.com>
+
+       * glib/gmessages.h: Use "if (expr) { } else" as I meant to in the
+       first place. The other form can trigger warnings in some compilers
+       that suspect a ";" after "if (expr)" is an error.
+
 2002-02-11  Manish Singh  <yosh@gimp.org>
 
        * glib/gmessages.h: need statement terminators for the if clauses for

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7b6fc3d..e14bd41 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2002-02-11  Darin Adler  <darin@bentspoon.com>
+
+       * glib/gmessages.h: Use "if (expr) { } else" as I meant to in the
+       first place. The other form can trigger warnings in some compilers
+       that suspect a ";" after "if (expr)" is an error.
+
 2002-02-11  Manish Singh  <yosh@gimp.org>
 
        * glib/gmessages.h: need statement terminators for the if clauses for

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7b6fc3d..e14bd41 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2002-02-11  Darin Adler  <darin@bentspoon.com>
+
+       * glib/gmessages.h: Use "if (expr) { } else" as I meant to in the
+       first place. The other form can trigger warnings in some compilers
+       that suspect a ";" after "if (expr)" is an error.
+
 2002-02-11  Manish Singh  <yosh@gimp.org>
 
        * glib/gmessages.h: need statement terminators for the if clauses for

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7b6fc3d..e14bd41 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2002-02-11  Darin Adler  <darin@bentspoon.com>
+
+       * glib/gmessages.h: Use "if (expr) { } else" as I meant to in the
+       first place. The other form can trigger warnings in some compilers
+       that suspect a ";" after "if (expr)" is an error.
+
 2002-02-11  Manish Singh  <yosh@gimp.org>
 
        * glib/gmessages.h: need statement terminators for the if clauses for

diff --git a/glib/gmessages.h b/glib/gmessages.h
index 2794028..3b82b05 100644 (file)
--- a/glib/gmessages.h
+++ b/glib/gmessages.h
@@ -193,7 +193,7 @@ GPrintFunc      g_set_printerr_handler  (GPrintFunc      func);
 #ifdef __GNUC__
 
 #define g_assert(expr)                 G_STMT_START{           \
-     if (expr); else                                           \
+     if (expr) { } else                                                \
        g_log (G_LOG_DOMAIN,                                    \
              G_LOG_LEVEL_ERROR,                                \
              "file %s: line %d (%s): assertion failed: (%s)",  \
@@ -213,7 +213,7 @@ GPrintFunc      g_set_printerr_handler  (GPrintFunc      func);
 #else /* !__GNUC__ */
 
 #define g_assert(expr)                 G_STMT_START{           \
-     if (expr); else                                           \
+     if (expr) { } else                                                \
        g_log (G_LOG_DOMAIN,                                    \
              G_LOG_LEVEL_ERROR,                                \
              "file %s: line %d: assertion failed: (%s)",       \
@@ -245,7 +245,7 @@ GPrintFunc      g_set_printerr_handler  (GPrintFunc      func);
 #ifdef __GNUC__
 
 #define g_return_if_fail(expr)         G_STMT_START{                   \
-     if (expr); else                                                   \
+     if (expr) { } else                                                        \
        {                                                               \
         g_log (G_LOG_DOMAIN,                                           \
                G_LOG_LEVEL_CRITICAL,                                   \
@@ -258,7 +258,7 @@ GPrintFunc      g_set_printerr_handler  (GPrintFunc      func);
        };                              }G_STMT_END
 
 #define g_return_val_if_fail(expr,val) G_STMT_START{                   \
-     if (expr); else                                                   \
+     if (expr) { } else                                                        \
        {                                                               \
         g_log (G_LOG_DOMAIN,                                           \
                G_LOG_LEVEL_CRITICAL,                                   \
@@ -291,7 +291,7 @@ GPrintFunc      g_set_printerr_handler  (GPrintFunc      func);
 #else /* !__GNUC__ */
 
 #define g_return_if_fail(expr)         G_STMT_START{           \
-     if (expr); else                                           \
+     if (expr) { } else                                                \
        {                                                       \
         g_log (G_LOG_DOMAIN,                                   \
                G_LOG_LEVEL_CRITICAL,                           \
@@ -303,7 +303,7 @@ GPrintFunc      g_set_printerr_handler  (GPrintFunc      func);
        };                              }G_STMT_END
 
 #define g_return_val_if_fail(expr, val)        G_STMT_START{           \
-     if (expr); else                                           \
+     if (expr) { } else                                                \
        {                                                       \
         g_log (G_LOG_DOMAIN,                                   \
                G_LOG_LEVEL_CRITICAL,                           \