[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115660: Fix compilation warning on MS-Windows in my
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] trunk r115660: Fix compilation warning on MS-Windows in my_png_error. |
Date: |
Sat, 21 Dec 2013 09:10:51 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115660
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2013-12-21 11:09:48 +0200
message:
Fix compilation warning on MS-Windows in my_png_error.
src/image.c (fn_png_longjmp) [WINDOWSNT]: Mark the function as
having the PNG_NORETURN attribute, to avoid compiler warning in
my_png_error.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/image.c image.c-20091113204419-o5vbwnq5f7feedwu-2969
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-12-21 07:04:07 +0000
+++ b/src/ChangeLog 2013-12-21 09:09:48 +0000
@@ -1,3 +1,9 @@
+2013-12-21 Eli Zaretskii <address@hidden>
+
+ * image.c (fn_png_longjmp) [WINDOWSNT]: Mark the function as
+ having the PNG_NORETURN attribute, to avoid compiler warning in
+ my_png_error.
+
2013-12-21 YAMAMOTO Mitsuharu <address@hidden>
* w32term.h (struct scroll_bar): Remove member `fringe_extended_p'.
=== modified file 'src/image.c'
--- a/src/image.c 2013-12-18 20:36:50 +0000
+++ b/src/image.c 2013-12-21 09:09:48 +0000
@@ -5536,7 +5536,7 @@
DEF_IMGLIB_FN (void, png_error, (png_structp, png_const_charp));
#if (PNG_LIBPNG_VER >= 10500)
-DEF_IMGLIB_FN (void, png_longjmp, (png_structp, int));
+DEF_IMGLIB_FN (void, png_longjmp, (png_structp, int)) PNG_NORETURN;
DEF_IMGLIB_FN (jmp_buf *, png_set_longjmp_fn, (png_structp, png_longjmp_ptr,
size_t));
#endif /* libpng version >= 1.5 */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115660: Fix compilation warning on MS-Windows in my_png_error.,
Eli Zaretskii <=