* config/alpha/vms.h (INCLUDE_DEFAULTS): Add /gnu/lib/gcc-lib/include.

[pf3gnuchains/gcc-fork.git] / gcc / ch / satisfy.c

diff --git a/gcc/ch/satisfy.c b/gcc/ch/satisfy.c
index a747669..00d90f8 100644 (file)
--- a/gcc/ch/satisfy.c
+++ b/gcc/ch/satisfy.c
@@ -1,5 +1,5 @@
 /* Name-satisfaction for GNU Chill compiler.
-   Copyright (C) 1993, 98, 99, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1998, 1999, 2000 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -67,7 +67,7 @@ safe_satisfy_decl (decl, prev_chain)
   struct decl_chain new_link;
   struct decl_chain *link;
   struct decl_chain *chain = prev_chain;
-  char *save_filename = input_filename;
+  const char *save_filename = input_filename;
   int save_lineno = lineno;
   tree result = decl;
   
@@ -87,7 +87,7 @@ safe_satisfy_decl (decl, prev_chain)
            {
              if (!pointer_type_breaks_cycle)
                {
-                 error_with_decl (decl, "Cycle: `%s' depends on ...");
+                 error_with_decl (decl, "cycle: `%s' depends on ...");
                  cycle_error_print (prev_chain, decl);
                  error_with_decl (decl, "  `%s'");
                  return error_mark_node;
@@ -186,6 +186,8 @@ safe_satisfy_decl (decl, prev_chain)
                }
              /* DECL_SIZE is set to prevent re-doing this stuff. */
              DECL_SIZE (decl) = TYPE_SIZE (TREE_TYPE (decl));
+             DECL_SIZE_UNIT (decl) = TYPE_SIZE_UNIT (TREE_TYPE (decl));
+
              if (! TREE_CONSTANT (DECL_INITIAL (decl))
                  && TREE_CODE (DECL_INITIAL (decl)) != ERROR_MARK)
                {
@@ -369,7 +371,8 @@ satisfy (exp, chain)
        default:
          ;
        }
-      arg_length = tree_code_length[TREE_CODE (exp)];
+
+      arg_length = TREE_CODE_LENGTH (TREE_CODE (exp));
       for (i = 0; i < arg_length; i++)
        SATISFY (TREE_OPERAND (exp, i));
       return exp;