2 files changed, 3 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2a2ef75a316..45ee0125eeb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,7 @@
         * image.c (four_corners_best): Mark locals as initialized.
         (gif_load): Initialize transparent_p to zero (Bug#8238).
         Mark another local as initialized.
+        (my_png_error, my_error_exit): Mark with NO_RETURN.
 
 2011-03-11  Paul Eggert  <eggert@cs.ucla.edu>
 
diff --git a/src/image.c b/src/image.c
index a4be1d1b898..7584f9bb2c0 100644
--- a/src/image.c
+++ b/src/image.c
@@ -5530,6 +5530,7 @@ init_png_functions (Lisp_Object libraries)
 /* Error and warning handlers installed when the PNG library
    is initialized.  */
 
+static void my_png_error (png_struct *, const char *) NO_RETURN;
 static void
 my_png_error (png_struct *png_ptr, const char *msg)
 {
@@ -6104,6 +6105,7 @@ struct my_jpeg_error_mgr
 };
 
 
+static void my_error_exit (j_common_ptr) NO_RETURN;
 static void
 my_error_exit (j_common_ptr cinfo)
 {