sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

another small boolean fix

Browse Source 
fixes a break on OS X with IJG jpeg
This commit is contained in:
John Cupitt 2013-10-17 09:43:18 +01:00
parent abfb5a5fc5
commit ec603594c1
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libvips/foreign/jpeg.h
View File

@ -42,11 +42,22 @@ extern "C" {
#undef HAVE_STDLIB_H #undef HAVE_STDLIB_H
#endif /*HAVE_STDLIB_H*/ #endif /*HAVE_STDLIB_H*/
/* jpeglib defines its own boolean type which then clashes with everyone /* jpeglib defines its own boolean type as an enum which then clashes with
* elses. Rename it as jboolean. * everyone elses. Rename it as jboolean.
*/ */
#define boolean 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 <jpeglib.h>
#include <jerror.h> #include <jerror.h>