From 63b6f9ea4b85008e2c470d6d15b39955dff8091a Mon Sep 17 00:00:00 2001 From: Andrew Pinski Date: Mon, 20 Dec 2004 22:32:39 +0000 Subject: [PATCH] re PR libobjc/12035 (Patch for libobjc/gc.c that fixes compilation error of Objective-C with garbage collector enabled) 2004-12-20 Andrew Pinski PR libobjc/12035 * gc.c: Remove definition of LOGWL, modWORDSZ, and divWORDSZ since they are not used. Include limits.h and stdlib.h. From-SVN: r92437 --- libobjc/ChangeLog | 6 ++++++ libobjc/gc.c | 15 +++------------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index 2d5fb1b4fe9..9968b12016e 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,9 @@ +2004-12-20 Andrew Pinski + + PR libobjc/12035 + * gc.c: Remove definition of LOGWL, modWORDSZ, and divWORDSZ since + they are not used. Include limits.h and stdlib.h. + 2004-12-12 Alexander Malmberg * selector.c (__objc_init_selector_tables): Add missing void to diff --git a/libobjc/gc.c b/libobjc/gc.c index 8f13dbc33ca..66aa78a32ee 100644 --- a/libobjc/gc.c +++ b/libobjc/gc.c @@ -31,26 +31,17 @@ Boston, MA 02111-1307, USA. */ #include #include +#include #if OBJC_WITH_GC #include +#include /* gc_typed.h uses the following but doesn't declare them */ typedef GC_word word; typedef GC_signed_word signed_word; - -#if BITS_PER_WORD == 32 -# define LOGWL 5 -# define modWORDSZ(n) ((n) & 0x1f) /* n mod size of word */ -#endif - -#if BITS_PER_WORD == 64 -# define LOGWL 6 -# define modWORDSZ(n) ((n) & 0x3f) /* n mod size of word */ -#endif - -#define divWORDSZ(n) ((n) >> LOGWL) /* divide n by size of word */ +#define BITS_PER_WORD (CHAR_BIT * sizeof (word)) #include