From ec603594c1cd20ba38db84fb91b27288d1720e61 Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Thu, 17 Oct 2013 09:43:18 +0100 Subject: [PATCH] another small boolean fix fixes a break on OS X with IJG jpeg --- libvips/foreign/jpeg.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/libvips/foreign/jpeg.h b/libvips/foreign/jpeg.h index 3b75da17..ac7e6edc 100644 --- a/libvips/foreign/jpeg.h +++ b/libvips/foreign/jpeg.h @@ -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 #include