cpplex.c (expand_name_space): Don't use ptrdiff_t.

2000-05-17  Neil Booth  <neilb@earthling.net>

	* cpplex.c (expand_name_space): Don't use ptrdiff_t.

From-SVN: r33964

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8d1c0acdf5245232b94be2daa74bee8d49555b7c..a82a24bc4d7eafaef3e4986de1d5d4c278215149 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2000-05-17  Neil Booth  <neilb@earthling.net>
+
+       * cpplex.c (expand_name_space): Don't use ptrdiff_t.
+
 2000-05-17  Zack Weinberg  <zack@wolery.cumb.org>
 
        * cpplib.c: New feature, #pragma system_header.

diff --git a/gcc/cpplex.c b/gcc/cpplex.c
index 03b3c35de4b05d2e5973303088237b59bce7c3fe..2549d227cdd60636d5457c603bc42fb1974d9916 100644 (file)
--- a/gcc/cpplex.c
+++ b/gcc/cpplex.c
@@ -526,21 +526,19 @@ expand_name_space (list, len)
      unsigned int len;
 {
   const U_CHAR *old_namebuf;
-  ptrdiff_t delta;
 
   old_namebuf = list->namebuf;
   list->name_cap += len;
   list->namebuf = (unsigned char *) xrealloc (list->namebuf, list->name_cap);
 
   /* Fix up token text pointers.  */
-  delta = list->namebuf - old_namebuf;
-  if (delta)
+  if (list->namebuf != old_namebuf)
     {
       unsigned int i;
 
       for (i = 0; i < list->tokens_used; i++)
        if (token_spellings[list->tokens[i].type].type > SPELL_NONE)
-         list->tokens[i].val.name.text += delta;
+         list->tokens[i].val.name.text += (list->namebuf - old_namebuf);
     }
 }