diff options
| author | Gavin Schenk <g.schenk@eckelmann.de> | 2017-11-23 12:54:05 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-12-01 14:11:57 +0100 |
| commit | 4a0738ec264fcbf809863dd245aff012bee274e6 (patch) | |
| tree | 294dd222b8e321eecf19399caaab71300167526b /patches/fbv-1.0b-ptx3 | |
| parent | 1f2a27bcad6b5a2e9c1067d06db58789d4caf276 (diff) | |
| download | ptxdist-4a0738ec264fcbf809863dd245aff012bee274e6.tar.gz ptxdist-4a0738ec264fcbf809863dd245aff012bee274e6.tar.xz | |
fbv: Fix build error due to direct access to jmpbuf
Signed-off-by: Gavin Schenk <g.schenk@eckelmann.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/fbv-1.0b-ptx3')
| -rw-r--r-- | patches/fbv-1.0b-ptx3/0001-fbv-Fix-build-error-due-to-direct-access-to-jmpbuf.patch | 34 | ||||
| -rw-r--r-- | patches/fbv-1.0b-ptx3/series | 4 |
2 files changed, 38 insertions, 0 deletions
diff --git a/patches/fbv-1.0b-ptx3/0001-fbv-Fix-build-error-due-to-direct-access-to-jmpbuf.patch b/patches/fbv-1.0b-ptx3/0001-fbv-Fix-build-error-due-to-direct-access-to-jmpbuf.patch new file mode 100644 index 000000000..cfe00b3fc --- /dev/null +++ b/patches/fbv-1.0b-ptx3/0001-fbv-Fix-build-error-due-to-direct-access-to-jmpbuf.patch @@ -0,0 +1,34 @@ +From: Gavin Schenk <g.schenk@eckelmann.de> +Date: Thu, 23 Nov 2017 12:13:48 +0100 +Subject: [PATCH] fbv: Fix build error due to direct access to jmpbuf + +The build fails with "dereferencing pointer to incomplete type" when +accessing the jmpbuf ptr directly. + +Using the macro png_jmpbuf(...) fixes this compiler error. +--- + png.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/png.c b/png.c +index 8a0c62073dfb..3f5afddbca5c 100644 +--- a/png.c ++++ b/png.c +@@ -69,7 +69,7 @@ int fh_png_load(char *name,unsigned char *buffer, unsigned char ** alpha,int x,i + fclose(fh); return(FH_ERROR_FORMAT); + } + rp=0; +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); + if(rp) free(rp); +@@ -161,7 +161,7 @@ int fh_png_getsize(char *name,int *x,int *y) + fclose(fh); return(FH_ERROR_FORMAT); + } + rp=0; +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); + if(rp) free(rp); diff --git a/patches/fbv-1.0b-ptx3/series b/patches/fbv-1.0b-ptx3/series new file mode 100644 index 000000000..1a7f9e2c6 --- /dev/null +++ b/patches/fbv-1.0b-ptx3/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-fbv-Fix-build-error-due-to-direct-access-to-jmpbuf.patch +# 696c9ccc35cdb0d48da69c868da299fd - git-ptx-patches magic |