From: Bruno Haible <bruno@clisp.org>
Date: Sun, 22 Jul 2012 19:31:42 +0000 (+0200)
Subject: getpass: Assume AC_CHECK_DECLS_ONCE invocation, like in getpass.m4.
X-Git-Tag: v0.1~525
X-Git-Url: http://erislabs.net/gitweb/?p=gnulib.git;a=commitdiff_plain;h=8d46fac47cefe83eb525daf763a9a8933c28e2f6

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.
---

diff --git a/ChangeLog b/ChangeLog
index 69437c98a..713c022c2 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 ba2126c82..f1bdec103 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 1a6719257..1eeedffe1 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);