From ef87443e1987ac2ea81c9985e6a1339f1780fc14 Mon Sep 17 00:00:00 2001 From: rfm Date: Thu, 25 Feb 2010 19:00:23 +0000 Subject: [PATCH] tweak for if bool is a reserved word git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@29754 72102866-910b-0410-8b05-ffd578937521 --- Headers/Additions/GNUstepBase/GSIMap.h | 2 +- Headers/Additions/GNUstepBase/GSUnion.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Headers/Additions/GNUstepBase/GSIMap.h b/Headers/Additions/GNUstepBase/GSIMap.h index 65cfb491c..096b3824a 100644 --- a/Headers/Additions/GNUstepBase/GSIMap.h +++ b/Headers/Additions/GNUstepBase/GSIMap.h @@ -978,7 +978,7 @@ GSIMapCountByEnumeratingWithStateObjectsCount(GSIMapTable map, * will only work with things that are id-sized, however, so don't * try using it with non-object collections. */ - stackbuf[i] = *(id*)&node->key.bool; + stackbuf[i] = *(id*)&node->key.bl; } } /* Store the important bits of the enumerator in the caller. */ diff --git a/Headers/Additions/GNUstepBase/GSUnion.h b/Headers/Additions/GNUstepBase/GSUnion.h index a45fed094..a42fbf165 100644 --- a/Headers/Additions/GNUstepBase/GSUnion.h +++ b/Headers/Additions/GNUstepBase/GSUnion.h @@ -121,7 +121,7 @@ typedef union { #if defined(GSUNION_EXTRA) GSUNION_EXTRA ext; #endif - BOOL bool; /* Guaranteed present */ + BOOL bl; /* Guaranteed present */ } GSUNION; #endif