diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6fb73d9b489..f3efe7a26dd 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-29  Neil Booth  <neil@daikokuya.demon.co.uk>
+
+        * cpplib.c (T_BAD_DIRECTIVE): Remove.
+        (_cpp_init_stacks): Loop from 0 to N_DIRECTIVES - 1.
+
 2001-01-29  Joseph S. Myers  <jsm28@cam.ac.uk>
 
 	* tree.c, tree.h (build_parse_node): Remove; was identical to
diff --git a/gcc/cpplib.c b/gcc/cpplib.c
index 9577d7235ac..5c422f563c8 100644
--- a/gcc/cpplib.c
+++ b/gcc/cpplib.c
@@ -161,7 +161,6 @@ DIRECTIVE_TABLE
 #define D(n, tag, o, f) tag,
 enum
 {
-  T_BAD_DIRECTIVE,
   DIRECTIVE_TABLE
   N_DIRECTIVES
 };
@@ -1870,17 +1869,17 @@ void
 _cpp_init_stacks (pfile)
      cpp_reader *pfile;
 {
-  int i;
+  unsigned int i;
   cpp_hashnode *node;
 
   pfile->buffer_ob = xnew (struct obstack);
   obstack_init (pfile->buffer_ob);
 
   /* Register the directives.  */
-  for (i = 1; i < N_DIRECTIVES; i++)
+  for (i = 0; i < N_DIRECTIVES; i++)
     {
-      node = cpp_lookup (pfile, dtable[i - 1].name, dtable[i - 1].length);
-      node->directive_index = i;
+      node = cpp_lookup (pfile, dtable[i].name, dtable[i].length);
+      node->directive_index = i + 1;
     }
 }