From 7c6bac667c2bfe4bca97f3bb3a1ae164bcd8f1cf Mon Sep 17 00:00:00 2001 From: prefect Date: Sun, 29 Jan 2006 19:46:31 +0000 Subject: [PATCH] Apparently, there's a conflict between setjmp.h and libpng in some cases. So don't always include setjmp.h This was SVN commit r3440. --- source/lib/precompiled.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/lib/precompiled.h b/source/lib/precompiled.h index caa85b5b44..8f70062137 100755 --- a/source/lib/precompiled.h +++ b/source/lib/precompiled.h @@ -1,7 +1,7 @@ // precompiled header. must be the first non-comment part of every source // file (VC6/7 requirement). // -// if the compiler supports PCH (i.e. HAVE_PCH is defined), this +// if the compiler supports PCH (i.e. HAVE_PCH is defined), this // tries to include all headers that may be needed. otherwise, all source // files will still need to include this (for various global fixes and the // memory trackers), but additionally include all required headers. @@ -83,7 +83,8 @@ #include #include #include -#include +// Including setjmp.h here causes incompatibilities with libpng on Debian/Ubuntu +//#include #include #include #include