Avoid function names used in standard libraries.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index d059c948c8cc731ee0a071e07e8895d51e1f1b74..6055de6ec73fde865babcf66a36272123966f2d9 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-22  Bruno Haible  <bruno@clisp.org>
+
+       * getstr.h (getstr): Define, to avoid clash with libcurses.
+       * linebuffer.h (readline): Define, to avoid clash with libreadline.
+
 2002-12-22  Bruno Haible  <bruno@clisp.org>
 
        * getdate.y (get_date): Test HAVE_STRUCT_TM_TM_ZONE, not HAVE_TM_ZONE.

diff --git a/lib/getstr.h b/lib/getstr.h
index 367bf4e11647e7901ca5d409a682971cf7cd8c89..48276d568236e1998ce1ba56b5d3e2614a2b6467 100644 (file)
--- a/lib/getstr.h
+++ b/lib/getstr.h
@@ -11,6 +11,9 @@
 #  endif
 # endif
 
+/* Avoid collision with getstr() from libcurses.  */
+#define getstr getdelim2
+
 int
 getstr PARAMS ((char **lineptr, size_t *n, FILE *stream,
                int delim1, int delim2,

diff --git a/lib/linebuffer.h b/lib/linebuffer.h
index 4e3549162b122d8f4425f392a33125c53c039fa5..dd76a4a2373ad2ad572091b9aec91fa3baeef463 100644 (file)
--- a/lib/linebuffer.h
+++ b/lib/linebuffer.h
@@ -1,5 +1,5 @@
 /* linebuffer.h -- declarations for reading arbitrarily long lines
-   Copyright (C) 1986, 1991, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1991, 1998, 1999, 2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -35,6 +35,9 @@ struct linebuffer
 #  endif
 # endif
 
+/* Avoid collision with readline() from libreadline.  */
+#define readline readlinebuffer
+
 /* Initialize linebuffer LINEBUFFER for use. */
 void initbuffer PARAMS ((struct linebuffer *linebuffer));