Mercurial > hg > octave-lojdl > gnulib-hg
changeset 4103:a615f32b9998
Avoid function names used in standard libraries.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Tue, 31 Dec 2002 12:59:53 +0000 |
| parents | 1804d7137fc9 |
| children | f16f0fbf6ce2 |
| files | lib/ChangeLog lib/getstr.h lib/linebuffer.h |
| diffstat | 3 files changed, 12 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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,
--- 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 @@ # endif # endif +/* Avoid collision with readline() from libreadline. */ +#define readline readlinebuffer + /* Initialize linebuffer LINEBUFFER for use. */ void initbuffer PARAMS ((struct linebuffer *linebuffer));