From 9adf8063043a1f5d413ff00b5add055eef7ea8f3 Mon Sep 17 00:00:00 2001 From: fedor Date: Thu, 8 May 2008 15:28:42 +0000 Subject: [PATCH] Degine HAVE_BOOLEAN on mingw to avoid jpeg conflicts git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@26500 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Source/NSBitmapImageRep+JPEG.m | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index 9b3ce3d0e..13cba9014 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-05-08 Adam Fedor + + * Source/NSBitmapImageRep+JPEG.m: Define HAVE_BOOLEAN to avoid + problem with jmorecfg.h header on mingw. + 2008-05-07 Adam Fedor * Source/NSSplitView.m (-adjustSubviews): Just return if there diff --git a/Source/NSBitmapImageRep+JPEG.m b/Source/NSBitmapImageRep+JPEG.m index 9ec900475..85fd27e45 100644 --- a/Source/NSBitmapImageRep+JPEG.m +++ b/Source/NSBitmapImageRep+JPEG.m @@ -44,6 +44,10 @@ #ifndef XMD_H #define XMD_H #endif +/* And another so that boolean is not redefined in jmorecfg.h. */ +#ifndef HAVE_BOOLEAN +#define HAVE_BOOLEAN +#endif #endif #include