Backed out changeset: b019ea52537e

Breaks build with more recent jpeglib such as used by nightly builds
Armin Burgmeier 2011-03-12 14:12:04 +01:00
parent 0d804cad50
commit fd2b981547
1 changed files with 1 additions and 5 deletions

View File

@ -294,11 +294,7 @@ extern "C"
/* avoid conflict with conflicting boolean and FAR typedefs */
#undef __RPCNDR_H__
#undef FAR
#ifdef jpeg_boolean
#define boolean jpeg_boolean
#else
#define jpeg_boolean boolean
#endif
#define boolean jpeg_boolean
#include <jpeglib.h>
#undef boolean
}