From: Andreas Färber Date: Sat, 24 May 2008 09:54:19 +0000 (+0200) Subject: Make stdbool work on Haiku OS. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cb4038cace4592bb62a5446e42541594354e815;p=pspp Make stdbool work on Haiku OS. --- diff --git a/ChangeLog b/ChangeLog index 05cdf1c613..594035caea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2008-05-24 Andreas Färber (tiny change) + + * lib/stdbool.in.h [__HAIKU__]: Disable __BEOS__ workarounds. + 2008-05-23 Bruno Haible Improve support for ACLs on OSF/1. diff --git a/lib/stdbool.in.h b/lib/stdbool.in.h index 2784a502bf..8e62b082d0 100644 --- a/lib/stdbool.in.h +++ b/lib/stdbool.in.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2002, 2003, 2006, 2007 Free Software Foundation, Inc. +/* Copyright (C) 2001-2003, 2006-2008 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software; you can redistribute it and/or modify @@ -58,7 +58,7 @@ /* BeOS already #defines false 0, true 1. We use the same definitions below, but temporarily we have to #undef them. */ -#ifdef __BEOS__ +#if defined __BEOS__ && !defined __HAIKU__ # include /* defines bool but not _Bool */ # undef false # undef true @@ -73,7 +73,7 @@ (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int' (see ISO C 99 6.3.1.1.(2)). So we add a negative value to the enum; this ensures that '_Bool' promotes to 'int'. */ -#if defined __cplusplus || defined __BEOS__ +#if defined __cplusplus || (defined __BEOS__ && !defined __HAIKU__) /* A compiler known to have 'bool'. */ /* If the compiler already has both 'bool' and '_Bool', we can assume they are the same types. */