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 /pngwrite.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 'pngwrite.c')
| -rw-r--r-- | pngwrite.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pngwrite.c b/pngwrite.c index bce00c0b3..bbd3de874 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -462,7 +462,7 @@ png_create_write_struct_2,(png_const_charp user_png_ver, png_voidp error_ptr, png_structp png_ptr; #ifdef PNG_SETJMP_SUPPORTED #ifdef USE_FAR_KEYWORD - jmp_buf png_jmpbuf; + jmp_buf tmp_jmpbuf; #endif #endif int i; @@ -489,12 +489,12 @@ png_create_write_struct_2,(png_const_charp user_png_ver, png_voidp error_ptr, encounter a png_error() will longjmp here. Since the jmpbuf is then meaningless we abort instead of returning. */ #ifdef USE_FAR_KEYWORD - if (setjmp(png_jmpbuf)) + if (setjmp(tmp_jmpbuf)) #else if (setjmp(png_jmpbuf(png_ptr))) /* sets longjmp to match setjmp */ #endif #ifdef USE_FAR_KEYWORD - png_memcpy(png_jmpbuf(png_ptr), png_jmpbuf, png_sizeof(jmp_buf)); + png_memcpy(png_jmpbuf(png_ptr), tmp_jmpbuf, png_sizeof(jmp_buf)); #endif PNG_ABORT(); #endif @@ -1020,7 +1020,7 @@ png_write_destroy(png_structp png_ptr) #ifdef PNG_SETJMP_SUPPORTED /* Reset structure */ - png_memcpy(tmp_jmp, png_ptr->png_jmpbuf, png_sizeof(jmp_buf)); + png_memcpy(tmp_jmp, png_ptr->longjmp_buffer, png_sizeof(jmp_buf)); #endif error_fn = png_ptr->error_fn; @@ -1040,7 +1040,7 @@ png_write_destroy(png_structp png_ptr) #endif #ifdef PNG_SETJMP_SUPPORTED - png_memcpy(png_ptr->png_jmpbuf, tmp_jmp, png_sizeof(jmp_buf)); + png_memcpy(png_ptr->longjmp_buffer, tmp_jmp, png_sizeof(jmp_buf)); #endif } |