File libpng-1.2.31-setjmp.diff of Package libpng12-0

--- pngconf.h
+++ pngconf.h
@@ -8,6 +8,11 @@
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  */
 
+/*
+ * special modification for suse:
+ * commented out hack for setjmp to avoid compile trouble
+ */
+
 /* Any machine specific code is near the front of this file, so if you
  * are configuring libpng for a machine, you may want to read the section
  * starting here down to where it starts to typedef png_color, png_text,
@@ -249,22 +254,20 @@
 #ifdef PNG_SETJMP_SUPPORTED
 /* This is an attempt to force a single setjmp behaviour on Linux.  If
  * the X config stuff didn't define _BSD_SOURCE we wouldn't need this.
+ * #  ifdef __linux__
+ * #    ifdef _BSD_SOURCE
+ * #      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.
+ *        __pngconf.h__ already includes setjmp.h;
+ *        __dont__ include it again.;
+ * #    endif
+ * #  endif  __linux__ 
  */
-
-#  ifdef __linux__
-#    ifdef _BSD_SOURCE
-#      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.
-      */
-         __pngconf.h__ already includes setjmp.h;
-         __dont__ include it again.;
-#    endif
-#  endif /* __linux__ */
-
+ 
    /* include setjmp.h for error handling */
 #  include <setjmp.h>
 
openSUSE Build Service is sponsored by