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.
This commit is contained in:
parent
30284fc7c5
commit
7c6bac667c
@ -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 <climits>
|
||||
#include <clocale>
|
||||
#include <cmath>
|
||||
#include <csetjmp>
|
||||
// Including setjmp.h here causes incompatibilities with libpng on Debian/Ubuntu
|
||||
//#include <csetjmp>
|
||||
#include <csignal>
|
||||
#include <cstdarg>
|
||||
#include <cstddef>
|
||||
|
Loading…
Reference in New Issue
Block a user