Index: Tk-804.028/PNG/libpng/pngconf.h
--- Tk-804.028/PNG/libpng/pngconf.h.orig	2007-05-05 20:38:41 +0200
+++ Tk-804.028/PNG/libpng/pngconf.h	2007-12-20 09:49:47 +0100
@@ -310,13 +310,6 @@
 #      define PNG_SAVE_BSD_SOURCE
 #      undef _BSD_SOURCE
 #    endif
-#    ifdef _SETJMP_H
-     /* If you encounter a compiler error here, see the explanation
-      * near the end of INSTALL.
-      */
-         __png.h__ already includes setjmp.h;
-         __dont__ include it again.;
-#    endif
 #  endif /* __linux__ */
 
    /* include setjmp.h for error handling */
Index: Tk-PNG-2.005/libpng/pngconf.h
--- Tk-PNG-2.005/libpng/pngconf.h.orig	2000-04-21 20:57:31 +0200
+++ Tk-PNG-2.005/libpng/pngconf.h	2007-12-20 09:48:54 +0100
@@ -119,10 +119,6 @@
 #define _PNG_SAVE_BSD_SOURCE
 #undef _BSD_SOURCE
 #endif
-#ifdef _SETJMP_H
-__png.h__ already includes setjmp.h
-__dont__ include it again
-#endif
 #endif /* __linux__ */
 
 /* include setjmp.h for error handling */