From 69967b04125e53811182a01d2700984469117339 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Wed, 15 Dec 2004 14:15:54 +0000
Subject: A whole bunch of changes to allow building for W32.

---
 common/simple-pwquery.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'common/simple-pwquery.c')

diff --git a/common/simple-pwquery.c b/common/simple-pwquery.c
index 1e8eae63b..e7f992a88 100644
--- a/common/simple-pwquery.c
+++ b/common/simple-pwquery.c
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
-#ifdef _WIN32
+#ifdef HAVE_W32_SYSTEM
 #include <winsock2.h>
 #else
 #include <sys/socket.h>
@@ -182,10 +182,8 @@ agent_send_all_options (int fd)
     }
 
   dft_ttyname = getenv ("GPG_TTY");
-#ifndef HAVE_W32_SYSTEM
   if ((!dft_ttyname || !*dft_ttyname) && ttyname (0))
     dft_ttyname = ttyname (0);
-#endif
   if (dft_ttyname && *dft_ttyname)
     {
       if ((rc=agent_send_option (fd, "ttyname", dft_ttyname)))
@@ -261,7 +259,7 @@ agent_send_all_options (int fd)
 static int
 agent_open (int *rfd)
 {
-#ifdef _WIN32
+#ifdef HAVE_W32_SYSTEM
   return SPWQ_NO_AGENT;  /* FIXME */
 #else
   int rc;
-- 
cgit v1.2.3