delete is taken by C++, remove is taken by <stdio.h> ...

diff --git a/gettext-tools/libgrep/ChangeLog b/gettext-tools/libgrep/ChangeLog
index c736ab78ed32aebbf6686cc76ab7e88d3dc9f207..d1c132ff9c75e16bee2bf5b4f95e62ca8965d922 100644 (file)
--- a/gettext-tools/libgrep/ChangeLog
+++ b/gettext-tools/libgrep/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-01  Bruno Haible  <bruno@clisp.org>
+
+       * dfa.c (delete_pos): Renamed from remove.
+       (epsclosure): Update.
+
 2006-10-29  Bruno Haible  <bruno@clisp.org>
 
        Make it compile in C++ mode.

diff --git a/gettext-tools/libgrep/dfa.c b/gettext-tools/libgrep/dfa.c
index 443b8c70fe34b621b6ba5d39fbfeba65e62fa6fc..c2c8285d3880c965558b2a444307d53ed7c24146 100644 (file)
--- a/gettext-tools/libgrep/dfa.c
+++ b/gettext-tools/libgrep/dfa.c
@@ -1442,7 +1442,7 @@ merge (position_set const *s1, position_set const *s2, position_set *m)
 
 /* Delete a position from a set. */
 static void
-remove (position p, position_set *s)
+delete_pos (position p, position_set *s)
 {
   int i;
 
@@ -1550,7 +1550,7 @@ epsclosure (position_set *s, struct dfa const *d)
       {
        old = s->elems[i];
        p.constraint = old.constraint;
-       remove(s->elems[i], s);
+       delete_pos(s->elems[i], s);
        if (visited[old.index])
          {
            --i;