From: Bruno Haible <bruno@clisp.org>
Date: Wed, 1 Nov 2006 21:31:09 +0000 (+0000)
Subject: delete is taken by C++, remove is taken by <stdio.h> ...
X-Git-Tag: v0.17~688
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b46515a097e626edaa03a83121e4fd95c77e343;p=thirdparty%2Fgettext.git

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

diff --git a/gettext-tools/libgrep/ChangeLog b/gettext-tools/libgrep/ChangeLog
index c736ab78e..d1c132ff9 100644
--- 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 443b8c70f..c2c8285d3 100644
--- 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;