2005-06-08 David Ayers <d.ayers@inode.at>

[pf3gnuchains/gcc-fork.git] / libobjc / gc.c

diff --git a/libobjc/gc.c b/libobjc/gc.c
index 8f13dbc..a476689 100644 (file)
--- a/libobjc/gc.c
+++ b/libobjc/gc.c
@@ -26,31 +26,22 @@ Boston, MA 02111-1307, USA.  */
    the executable file might be covered by the GNU General Public License.  */
 
 #include "tconfig.h"
-#include "objc.h"
-#include "encoding.h"
+#include "objc/objc.h"
+#include "objc/encoding.h"
 
 #include <assert.h>
 #include <string.h>
+#include <stdlib.h>
 
 #if OBJC_WITH_GC
 
 #include <gc.h>
+#include <limits.h>
 
 /* 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 <gc_typed.h>