diff options
| author | John Bowler <jbowler@acm.org> | 2011-04-27 14:47:15 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2011-04-27 14:47:15 -0500 |
| commit | e6dc85bb0bb5a3f6b5df6df4308a183b304d867c (patch) | |
| tree | 64f91f72ed7c076d5fb55b5465ec311f2f0a7727 /pngerror.c | |
| parent | 20786be695e82fe4d23935d81f5aa76a24e6a54d (diff) | |
| download | libpng-e6dc85bb0bb5a3f6b5df6df4308a183b304d867c.tar.gz | |
[devel] Changed png_struct jmp_buf member name to avoid clash with macro
Diffstat (limited to 'pngerror.c')
| -rw-r--r-- | pngerror.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pngerror.c b/pngerror.c index 8290bb410..e90560c24 100644 --- a/pngerror.c +++ b/pngerror.c @@ -272,7 +272,7 @@ png_set_longjmp_fn(png_structp png_ptr, png_longjmp_ptr longjmp_fn, return NULL; png_ptr->longjmp_fn = longjmp_fn; - return &png_ptr->png_jmpbuf; + return &png_ptr->longjmp_buffer; } #endif @@ -335,13 +335,13 @@ png_longjmp,(png_structp png_ptr, int val),PNG_NORETURN) { # ifdef USE_FAR_KEYWORD { - jmp_buf png_jmpbuf; - png_memcpy(png_jmpbuf, png_ptr->png_jmpbuf, png_sizeof(jmp_buf)); - png_ptr->longjmp_fn(png_jmpbuf, val); + jmp_buf tmp_jmpbuf; + png_memcpy(tmp_jmpbuf, png_ptr->longjmp_buffer, png_sizeof(jmp_buf)); + png_ptr->longjmp_fn(tmp_jmpbuf, val); } # else - png_ptr->longjmp_fn(png_ptr->png_jmpbuf, val); + png_ptr->longjmp_fn(png_ptr->longjmp_buffer, val); # endif } #endif @@ -403,7 +403,7 @@ png_default_warning(png_structp png_ptr, png_const_charp warning_message) /* This function is called when the application wants to use another method * of handling errors and warnings. Note that the error function MUST NOT * return to the calling routine or serious problems will occur. The return - * method used in the default routine calls longjmp(png_ptr->png_jmpbuf, 1) + * method used in the default routine calls longjmp(png_ptr->longjmp_buffer, 1) */ void PNGAPI png_set_error_fn(png_structp png_ptr, png_voidp error_ptr, |