Mercurial > hg > octave-lojdl > gnulib-hg
changeset 1216:cf3c93b52b9b
Make PARAMS-defining conditionals consistent.
| author | Jim Meyering <jim@meyering.net> |
|---|---|
| date | Fri, 16 Jan 1998 08:51:39 +0000 |
| parents | f28266e1c1dc |
| children | 8dc7f4be4a7f |
| files | lib/linebuffer.h lib/memcasecmp.h lib/xstrtod.h |
| diffstat | 3 files changed, 27 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/linebuffer.h +++ b/lib/linebuffer.h @@ -1,5 +1,5 @@ /* linebuffer.h -- declarations for reading arbitrarily long lines - Copyright (C) 1986, 1991 Free Software Foundation, Inc. + Copyright (C) 1986, 1991, 1998 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 @@ -14,7 +14,10 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + +#if !defined LINEBUFFER_H +# define LINEBUFFER_H + /* A `struct linebuffer' holds a line of text. */ struct linebuffer @@ -24,12 +27,13 @@ char *buffer; }; -#undef PARAMS -#if defined (__STDC__) && __STDC__ -# define PARAMS(Args) Args -#else -# define PARAMS(Args) () -#endif +# ifndef PARAMS +# if defined PROTOTYPES || (defined __STDC__ && __STDC__) +# define PARAMS(Args) Args +# else +# define PARAMS(Args) () +# endif +# endif /* Initialize linebuffer LINEBUFFER for use. */ void initbuffer PARAMS ((struct linebuffer *linebuffer)); @@ -42,3 +46,5 @@ /* Free linebuffer LINEBUFFER and its data, all allocated with malloc. */ void freebuffer PARAMS ((struct linebuffer *)); + +#endif /* LINEBUFFER_H */
--- a/lib/memcasecmp.h +++ b/lib/memcasecmp.h @@ -1,8 +1,9 @@ -#undef PARAMS -#if defined (__STDC__) && __STDC__ -# define PARAMS(Args) Args -#else -# define PARAMS(Args) () +#ifndef PARAMS +# if defined PROTOTYPES || (defined __STDC__ && __STDC__) +# define PARAMS(Args) Args +# else +# define PARAMS(Args) () +# endif #endif int
--- a/lib/xstrtod.h +++ b/lib/xstrtod.h @@ -1,12 +1,13 @@ #ifndef XSTRTOD_H # define XSTRTOD_H 1 -#undef PARAMS -#if defined (__STDC__) && __STDC__ -# define PARAMS(Args) Args -#else -# define PARAMS(Args) () -#endif +# ifndef PARAMS +# if defined PROTOTYPES || (defined __STDC__ && __STDC__) +# define PARAMS(Args) Args +# else +# define PARAMS(Args) () +# endif +# endif int xstrtod PARAMS ((const char *str, const char **ptr, double *result));