aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-03-13 00:04:44 -0800
committerPaul Eggert2011-03-13 00:04:44 -0800
commitec6cf4c6ff2e43e3f42a2efe2759bc0c18b680cb (patch)
treeeb14dc54e32c2188f4788b9222db2f4635e1a970 /src
parentf0c77cd1b28a5ee9de06eef06c768fe34d7f0140 (diff)
downloademacs-ec6cf4c6ff2e43e3f42a2efe2759bc0c18b680cb.tar.gz
emacs-ec6cf4c6ff2e43e3f42a2efe2759bc0c18b680cb.zip
* image.c (my_png_error, my_error_exit): Mark with NO_RETURN.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog1
-rw-r--r--src/image.c2
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 @@
3 * image.c (four_corners_best): Mark locals as initialized. 3 * image.c (four_corners_best): Mark locals as initialized.
4 (gif_load): Initialize transparent_p to zero (Bug#8238). 4 (gif_load): Initialize transparent_p to zero (Bug#8238).
5 Mark another local as initialized. 5 Mark another local as initialized.
6 (my_png_error, my_error_exit): Mark with NO_RETURN.
6 7
72011-03-11 Paul Eggert <eggert@cs.ucla.edu> 82011-03-11 Paul Eggert <eggert@cs.ucla.edu>
8 9
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)
5530/* Error and warning handlers installed when the PNG library 5530/* Error and warning handlers installed when the PNG library
5531 is initialized. */ 5531 is initialized. */
5532 5532
5533static void my_png_error (png_struct *, const char *) NO_RETURN;
5533static void 5534static void
5534my_png_error (png_struct *png_ptr, const char *msg) 5535my_png_error (png_struct *png_ptr, const char *msg)
5535{ 5536{
@@ -6104,6 +6105,7 @@ struct my_jpeg_error_mgr
6104}; 6105};
6105 6106
6106 6107
6108static void my_error_exit (j_common_ptr) NO_RETURN;
6107static void 6109static void
6108my_error_exit (j_common_ptr cinfo) 6110my_error_exit (j_common_ptr cinfo)
6109{ 6111{