summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--cfg.mk2
-rw-r--r--lib/getpass.h2
3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 69437c98a7..713c022c23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-07-22 Bruno Haible <bruno@clisp.org>
+
+ getpass: Assume AC_CHECK_DECLS_ONCE invocation, like in getpass.m4.
+ * lib/getpass.h: Assume HAVE_DECL_GETPASS is defined.
+ * cfg.mk (exclude_file_name_regexp--sc_prohibit_defined_have_decl_tests):
+ Remove exemption for getpass.h.
+ Suggested by Eric Blake.
+
2012-07-20 Eric Blake <eblake@redhat.com>
verify: document conflict with -Wnested-externs
diff --git a/cfg.mk b/cfg.mk
index ba2126c820..f1bdec103c 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -79,4 +79,4 @@ exclude_file_name_regexp--sc_avoid_if_before_free = \
^lib/($(if_before_free_basename_re_))\.c$$
exclude_file_name_regexp--sc_prohibit_defined_have_decl_tests = \
- ^lib/((error|getopt|strtoimax)\.c|(argp-namefrob|getpass)\.h)$$
+ ^lib/((error|getopt|strtoimax)\.c|(argp-namefrob)\.h)$$
diff --git a/lib/getpass.h b/lib/getpass.h
index 1a67192572..1eeedffe15 100644
--- a/lib/getpass.h
+++ b/lib/getpass.h
@@ -21,7 +21,7 @@
/* Get getpass declaration, if available. */
# include <unistd.h>
-# if defined HAVE_DECL_GETPASS && !HAVE_DECL_GETPASS
+# if !HAVE_DECL_GETPASS
/* Read a password of arbitrary length from /dev/tty or stdin. */
char *getpass (const char *prompt);