[Libreoffice] BOOL redefinition problem

[Norbert Thiebaud]

On Thu, Oct 21, 2010 at 3:52 PM, Thomas Klausner <wiz at netbsd.org> wrote:
> Hi!
>
> Entering /disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/connectivity/source/drivers/adabas
>
> Compiling: connectivity/unxbsdx3.pro/misc/adabas_dflt_version.c
> Compiling: connectivity/source/drivers/adabas/BDriver.cxx
> /usr/pkg/include/iodbcunix.h:136: error: conflicting declaration 'typedef int BOOL'
> /disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solver/330/unxbsdx3.pro/inc/tools/solar.h:57: error: 'BOOL' has a previous declaration as 'typedef sal_Bool BOOL'
> dmake:  Error code 1, while making '../../../unxbsdx3.pro/slo/BDriver.obj'
>
> Lines 135-137 of iodbcunix.h:
> #if !defined(BOOL) && !defined(_OBJC_OBJC_H_)
> typedef int                     BOOL;
> #endif
>
> Line 57 of solar.h is:
> typedef sal_Bool                BOOL;   /* typedef unsigned char   BOOL; */
>
> Suggestions?

Completely untested but:

in BDriver.cxx, move
#include "odbc/OFunction.hh" and odbc/OTools.hxx to the end of the
include list, and just before them add #undef BOOL. see if that help
(the more permanent solution is to convert BOOL to sal_Bool and remove
the definition into solar.h.. that is in the 'easy hack' todo list...
but it is quite a big 'easy' task

Norbert


>  Thomas
> _______________________________________________
> LibreOffice mailing list
> LibreOffice at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>