2006-05-26 Martin Lambers <marlam@marlam.de>

	* getpass.c: Updates the test for the native W32 API, and adds
	missing includes, thus fixing compilation warnings.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index a015d11e9a128ec67cd7922debdfd96d61a7d766..9e687aec65daa5c00fd7d53dcba92cda99abd422 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-26  Martin Lambers  <marlam@marlam.de>
+
+       * getpass.c: Updates the test for the native W32 API, and adds
+       missing includes, thus fixing compilation warnings.
+
 2006-05-25  Paul Eggert  <eggert@cs.ucla.edu>
 
        * tempname.c (small_open, large_open): New macros.

diff --git a/lib/getpass.c b/lib/getpass.c
index f0b3184eeb219eef51d203ecf141f6a87b9fa1ad..4e3339659d1bcd303ee2671623eba695f8aa1b45 100644 (file)
--- a/lib/getpass.c
+++ b/lib/getpass.c
@@ -23,7 +23,7 @@
 
 #include <stdio.h>
 
-#if !defined _WIN32
+#if !((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__)
 
 #include <stdbool.h>
 
@@ -170,13 +170,17 @@ getpass (const char *prompt)
   return buf;
 }
 
-#else /* WIN32 */
+#else /* W32 native */
 
 /* Windows implementation by Martin Lambers <marlam@marlam.de>,
    improved by Simon Josefsson. */
 
 /* For PASS_MAX. */
 #include <limits.h>
+/* For _getch(). */
+#include <conio.h>
+/* For strdup(). */
+#include <string.h>
 
 #ifndef PASS_MAX
 # define PASS_MAX 512