From 2f11709f3bdeadf9fed1db0bc256936fa6ff283f Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sun, 14 Mar 2004 04:36:04 +0000 Subject: [PATCH] Add __extension__ to G_STMT_START to quite gcc -pedantic. (#131899, Sat Mar 13 23:30:53 2004 Owen Taylor * glib/gmacros.h (G_STMT_START): Add __extension__ to G_STMT_START to quite gcc -pedantic. (#131899, Olivier Biot) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-12 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ glib/gmacros.h | 2 +- 7 files changed, 37 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2e377cc8..25c684a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Mar 13 23:30:53 2004 Owen Taylor + + * glib/gmacros.h (G_STMT_START): Add __extension__ + to G_STMT_START to quite gcc -pedantic. (#131899, + Olivier Biot) + Sat Mar 13 23:18:45 2004 Owen Taylor * tests/env-test.c (main): Remove critical log handler; diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2e377cc8..25c684a0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sat Mar 13 23:30:53 2004 Owen Taylor + + * glib/gmacros.h (G_STMT_START): Add __extension__ + to G_STMT_START to quite gcc -pedantic. (#131899, + Olivier Biot) + Sat Mar 13 23:18:45 2004 Owen Taylor * tests/env-test.c (main): Remove critical log handler; diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 2e377cc8..25c684a0 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +Sat Mar 13 23:30:53 2004 Owen Taylor + + * glib/gmacros.h (G_STMT_START): Add __extension__ + to G_STMT_START to quite gcc -pedantic. (#131899, + Olivier Biot) + Sat Mar 13 23:18:45 2004 Owen Taylor * tests/env-test.c (main): Remove critical log handler; diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 2e377cc8..25c684a0 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sat Mar 13 23:30:53 2004 Owen Taylor + + * glib/gmacros.h (G_STMT_START): Add __extension__ + to G_STMT_START to quite gcc -pedantic. (#131899, + Olivier Biot) + Sat Mar 13 23:18:45 2004 Owen Taylor * tests/env-test.c (main): Remove critical log handler; diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2e377cc8..25c684a0 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sat Mar 13 23:30:53 2004 Owen Taylor + + * glib/gmacros.h (G_STMT_START): Add __extension__ + to G_STMT_START to quite gcc -pedantic. (#131899, + Olivier Biot) + Sat Mar 13 23:18:45 2004 Owen Taylor * tests/env-test.c (main): Remove critical log handler; diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2e377cc8..25c684a0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sat Mar 13 23:30:53 2004 Owen Taylor + + * glib/gmacros.h (G_STMT_START): Add __extension__ + to G_STMT_START to quite gcc -pedantic. (#131899, + Olivier Biot) + Sat Mar 13 23:18:45 2004 Owen Taylor * tests/env-test.c (main): Remove critical log handler; diff --git a/glib/gmacros.h b/glib/gmacros.h index a5d97f10..d205053f 100644 --- a/glib/gmacros.h +++ b/glib/gmacros.h @@ -191,7 +191,7 @@ */ #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_START (void) __extension__ ( # define G_STMT_END ) # else # if (defined (sun) || defined (__sun__)) -- 2.34.1