another small boolean fix
fixes a break on OS X with IJG jpeg
This commit is contained in:
parent
abfb5a5fc5
commit
ec603594c1
@ -42,11 +42,22 @@ extern "C" {
|
||||
#undef HAVE_STDLIB_H
|
||||
#endif /*HAVE_STDLIB_H*/
|
||||
|
||||
/* jpeglib defines its own boolean type which then clashes with everyone
|
||||
* elses. Rename it as jboolean.
|
||||
/* jpeglib defines its own boolean type as an enum which then clashes with
|
||||
* everyone elses. Rename it as jboolean.
|
||||
*/
|
||||
#define boolean jboolean
|
||||
|
||||
/* Any TRUE/FALSE macros which have crept in will cause terrible confusion as
|
||||
* well.
|
||||
*/
|
||||
#ifdef TRUE
|
||||
#undef TRUE
|
||||
#endif /*TRUE*/
|
||||
|
||||
#ifdef FALSE
|
||||
#undef FALSE
|
||||
#endif /*FALSE*/
|
||||
|
||||
#include <jpeglib.h>
|
||||
#include <jerror.h>
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user