From: Gavin Schenk <g.schenk@eckelmann.de>
To: ptxdist@pengutronix.de
Cc: Gavin Schenk <g.schenk@eckelmann.de>
Subject: [ptxdist] [PATCH v2] fbv: Fix build error due to direct access to jmpbuf
Date: Thu, 23 Nov 2017 12:54:05 +0100 [thread overview]
Message-ID: <20171123115405.3701-1-g.schenk@eckelmann.de> (raw)
Signed-off-by: Gavin Schenk <g.schenk@eckelmann.de>
---
...uild-error-due-to-direct-access-to-jmpbuf.patch | 34 ++++++++++++++++++++++
patches/fbv-1.0b-ptx3/series | 4 +++
2 files changed, 38 insertions(+)
create mode 100644 patches/fbv-1.0b-ptx3/0001-fbv-Fix-build-error-due-to-direct-access-to-jmpbuf.patch
create mode 100644 patches/fbv-1.0b-ptx3/series
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
--
2.15.0
Eckelmann AG
Vorstand: Dipl.-Ing. Peter Frankenbach (Sprecher) Dipl.-Wi.-Ing. Philipp Eckelmann
Dr.-Ing. Marco Münchhof Dr.-Ing. Frank Uhlemann
Vorsitzender des Aufsichtsrats: Hubertus G. Krossa
Stv. Vorsitzender des Aufsichtsrats: Dr.-Ing. Gerd Eckelmann
Sitz der Gesellschaft: Berliner Str. 161, 65205 Wiesbaden, Amtsgericht Wiesbaden HRB 12636
http://www.eckelmann.de
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
reply other threads:[~2017-11-23 11:54 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171123115405.3701-1-g.schenk@eckelmann.de \
--to=g.schenk@eckelmann.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox