(fflush_unlocked, flockfile, funlockfile)

(funlockfile, fputs_unlocked, putc_unlocked): Don't define if
already declared.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 32a470b25814842c05e6c5d150dcd37cbbe5dae8..c73c45602fa05dd8cf97e927f43aa3a62d765172 100644 (file)
--- 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.

diff --git a/lib/getpass.c b/lib/getpass.c
index 78f21e01973772a17e9501d5cf4e8d7009fd1d66..4f520aef3bfc3ae82dd7bca3c5f999da7d379cd7 100644 (file)
--- 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