Mercurial > hg > octave-lojdl > gnulib-hg
changeset 5379:0f39ce3026e9
(fflush_unlocked, flockfile, funlockfile)
(funlockfile, fputs_unlocked, putc_unlocked): Don't define if
already declared.
| author | Simon Josefsson <simon@josefsson.org> |
|---|---|
| date | Mon, 01 Nov 2004 21:45:37 +0000 |
| parents | 45a2a4e79f23 |
| children | 9cd2693d18a3 |
| files | lib/ChangeLog lib/getpass.c |
| diffstat | 2 files changed, 26 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,9 @@ +2004-11-01 Paul Eggert <eggert@cs.ucla.edu> + + * lib/getpass.c (fflush_unlocked, flockfile, funlockfile) + (funlockfile, fputs_unlocked, putc_unlocked): Don't define if + already declared. + 2004-10-29 Paul Eggert <eggert@cs.ucla.edu> * getdate.y: Add support for TZ="foo" within a date string.
--- a/lib/getpass.c +++ b/lib/getpass.c @@ -58,16 +58,26 @@ #elif USE_UNLOCKED_IO # include "unlocked-io.h" #else -# undef fflush_unlocked -# define fflush_unlocked(x) fflush (x) -# undef flockfile -# define flockfile(x) ((void) 0) -# undef funlockfile -# define funlockfile(x) ((void) 0) -# undef fputs_unlocked -# define fputs_unlocked(str,stream) fputs (str, stream) -# undef putc_unlocked -# define putc_unlocked(c,stream) putc (c, stream) +# if !HAVE_DECL_FFLUSH_UNLOCKED +# undef fflush_unlocked +# define fflush_unlocked(x) fflush (x) +# endif +# if !HAVE_DECL_FLOCKFILE +# undef flockfile +# define flockfile(x) ((void) 0) +# endif +# if !HAVE_DECL_FUNLOCKFILE +# undef funlockfile +# define funlockfile(x) ((void) 0) +# endif +# if !HAVE_DECL_FPUTS_UNLOCKED +# undef fputs_unlocked +# define fputs_unlocked(str,stream) fputs (str, stream) +# endif +# if !HAVE_DECL_PUTC_UNLOCKED +# undef putc_unlocked +# define putc_unlocked(c,stream) putc (c, stream) +# endif #endif #if _LIBC