diff --git a/ChangeLog b/ChangeLog
index 598e57291..7981ec335 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-28  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/gmessages.h: Mark g_assert_warning as G_GNUC_NORETURN,
+	to avoid compiler warnings.  (#156767, Owen Taylor)
+
 2004-10-29  Tor Lillqvist  <tml@iki.fi>
 
 	* glib/gstdio.c: Include also <direct.h> for mkdir() prototype
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 598e57291..7981ec335 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-10-28  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/gmessages.h: Mark g_assert_warning as G_GNUC_NORETURN,
+	to avoid compiler warnings.  (#156767, Owen Taylor)
+
 2004-10-29  Tor Lillqvist  <tml@iki.fi>
 
 	* glib/gstdio.c: Include also <direct.h> for mkdir() prototype
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 598e57291..7981ec335 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2004-10-28  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/gmessages.h: Mark g_assert_warning as G_GNUC_NORETURN,
+	to avoid compiler warnings.  (#156767, Owen Taylor)
+
 2004-10-29  Tor Lillqvist  <tml@iki.fi>
 
 	* glib/gstdio.c: Include also <direct.h> for mkdir() prototype
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 598e57291..7981ec335 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-10-28  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/gmessages.h: Mark g_assert_warning as G_GNUC_NORETURN,
+	to avoid compiler warnings.  (#156767, Owen Taylor)
+
 2004-10-29  Tor Lillqvist  <tml@iki.fi>
 
 	* glib/gstdio.c: Include also <direct.h> for mkdir() prototype
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 598e57291..7981ec335 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-10-28  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/gmessages.h: Mark g_assert_warning as G_GNUC_NORETURN,
+	to avoid compiler warnings.  (#156767, Owen Taylor)
+
 2004-10-29  Tor Lillqvist  <tml@iki.fi>
 
 	* glib/gstdio.c: Include also <direct.h> for mkdir() prototype
diff --git a/glib/gmessages.h b/glib/gmessages.h
index 381e7853b..a739530b7 100644
--- a/glib/gmessages.h
+++ b/glib/gmessages.h
@@ -116,7 +116,7 @@ void g_assert_warning         (const char *log_domain,
 			       const char *file,
 			       const int   line,
 		               const char *pretty_function,
-		               const char *expression);
+		               const char *expression) G_GNUC_NORETURN;
 
 
 #ifndef G_LOG_DOMAIN