--- R-2.10.1/src/modules/X11/rbitmap.c.orig	2011-07-03 14:13:36.377499392 +1000
+++ R-2.10.1/src/modules/X11/rbitmap.c	2011-07-03 14:14:35.785715090 +1000
@@ -70,7 +70,7 @@
 static void my_png_error(png_structp png_ptr, png_const_charp msg)
 {
     R_ShowMessage((char *) msg);
-    longjmp(png_ptr->jmpbuf,1);
+    longjmp(png_jmpbuf(png_ptr),1);
 }
 
 static void my_png_warning(png_structp png_ptr, png_const_charp msg)
@@ -124,7 +124,7 @@
     /* Set error handling.  REQUIRED if you aren't supplying your own
      * error handling functions in the png_create_write_struct() call.
      */
-    if (setjmp(png_ptr->jmpbuf)) {
+    if (setjmp(png_jmpbuf(png_ptr))) {
 	/* If we get here, we had a problem writing the file */
 	free(scanline);
 	png_destroy_write_struct(&png_ptr, &info_ptr);