[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
'remove' is reserved
From: |
Ralf Wildenhues |
Subject: |
'remove' is reserved |
Date: |
Tue, 31 Oct 2006 19:48:24 +0100 |
User-agent: |
Mutt/1.5.13 (2006-08-11) |
Hello Bruno,
I get this error with CVS gettext:
| make[3]: Entering directory `/tmp/gettext/build/gettext-tools/libgrep'
| gcc -DHAVE_CONFIG_H -I. -I.. -I../../../gettext/gettext-tools/libgrep -I..
-I../gnulib-lib -I../../../gettext/gettext-tools/gnulib-lib -I../intl -g -O2
-c ../../../gettext/gettext-tools/libgrep/dfa.c
| ../../../gettext/gettext-tools/libgrep/dfa.c:1446: error: conflicting types
for ‘remove’
| /usr/include/stdio.h:152: error: previous declaration of ‘remove’ was here
| make[3]: *** [dfa.o] Fehler 1
How about this patch?
Cheers,
Ralf
2006-10-31 Ralf Wildenhues <address@hidden>
* dfa.c (remove_position): Renamed from...
(remove): ...this.
(epsclosure): Adjust.
Index: gettext-tools/libgrep/dfa.c
===================================================================
RCS file: /cvsroot/gettext/gettext/gettext-tools/libgrep/dfa.c,v
retrieving revision 1.7
diff -u -r1.7 dfa.c
--- gettext-tools/libgrep/dfa.c 31 Oct 2006 12:41:52 -0000 1.7
+++ gettext-tools/libgrep/dfa.c 31 Oct 2006 18:23:15 -0000
@@ -1442,7 +1442,7 @@
/* Delete a position from a set. */
static void
-remove (position p, position_set *s)
+remove_position (position p, position_set *s)
{
int i;
@@ -1550,7 +1550,7 @@
{
old = s->elems[i];
p.constraint = old.constraint;
- remove(s->elems[i], s);
+ remove_position(s->elems[i], s);
if (visited[old.index])
{
--i;
- 'remove' is reserved,
Ralf Wildenhues <=