~ubuntu-branches/ubuntu/intrepid/libpng/intrepid-security

« back to all changes in this revision

Viewing changes to debian/patches/setjmp_error.patch

• browse files at revision 8
• compare with another revision
• download diff
• download tarball
• view history from revision 8

Show diffs side-by-side

added

removed

debian/patches/setjmp_error.patch

1

 

--- pngconf.h.orig      2005-09-13 00:24:26.000000000 +0200

2

 

+++ pngconf.h   2005-09-13 00:56:00.000000000 +0200

3

 

@@ -299,13 +299,18 @@

4

 

 #    ifdef _BSD_SOURCE

5

 

 #      define PNG_SAVE_BSD_SOURCE

6

 

 #      undef _BSD_SOURCE

7

 

-#    endif

8

 

-#    ifdef _SETJMP_H

9

 

-     /* If you encounter a compiler error here, see the explanation

10

 

-      * near the end of INSTALL.

11

 

-      */

12

 

-         __png.h__ already includes setjmp.h;

13

 

-         __dont__ include it again.;

14

 

+#      ifdef _SETJMP_H

15

 

+/* Explanation added by debian maintainer Philippe Troin <phil@fifi.org>.

16

 

+   There are two versions of setjmp, depending wether or not we compile for

17

 

+   BSD. They are incompatible and can cause crashes. The PNG people force

18

 

+   here a unique behavior for setjmp. It fou get the error below,

19

 

+   then include <png.h> before <setjmp.h>.

20

 

+*/

21

 

+/* Extra modification by Josselin Mouette <joss@debian.org>: there is no

22

 

+ * need to fail if we are not using _BSD_SOURCE.

23

 

+ * */

24

 

+#        error png.h already includes setjmp.h with some additional fixup.

25

 

+#      endif

26

 

 #    endif

27

 

 #  endif /* __linux__ */

28

 

 

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1