From 6fd120ffe982ec7b6d817c7f0171ac0115ea1ac3 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 31 Dec 2002 12:59:53 +0000 Subject: [PATCH] Avoid function names used in standard libraries. --- lib/ChangeLog | 5 +++++ lib/getstr.h | 3 +++ lib/linebuffer.h | 5 ++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index d059c948c..6055de6ec 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,5 +1,10 @@ 2002-12-22 Bruno Haible + * getstr.h (getstr): Define, to avoid clash with libcurses. + * linebuffer.h (readline): Define, to avoid clash with libreadline. + +2002-12-22 Bruno Haible + * getdate.y (get_date): Test HAVE_STRUCT_TM_TM_ZONE, not HAVE_TM_ZONE. 2002-12-23 Bruno Haible diff --git a/lib/getstr.h b/lib/getstr.h index 367bf4e11..48276d568 100644 --- 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 4e3549162..dd76a4a23 100644 --- 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)); -- 2.11.0