Define variables within the intended scope (not windows). Based on patch by LRN.

5 files changed, 12 insertions, 3 deletions

diff --git a/src/cli.c b/src/cli.c
index 963f7fc2de..3ff25d5ae0 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -660,11 +660,13 @@ handle_error (socket_st * hd, int err)
 
 int starttls_alarmed = 0;
 
+#ifndef _WIN32
 static void
 starttls_alarm (int signum)
 {
   starttls_alarmed = 1;
 }
+#endif
 
 static void
 tls_log_func (int level, const char *str)
diff --git a/src/crypt.c b/src/crypt.c
index fd9f0f8520..f804f81d1a 100644
--- a/src/crypt.c
+++ b/src/crypt.c
@@ -406,7 +406,9 @@ int main (int argc, char **argv)
   gaainfo info;
   const char *passwd;
   int salt_size, ret;
-  struct passwd *pwd;
+#ifndef _WIN32
+   struct passwd *pwd;
+#endif
 
   set_program_name (argv[0]);
 
diff --git a/src/psk.c b/src/psk.c
index eba25a64c8..dab0c14340 100644
--- a/src/psk.c
+++ b/src/psk.c
@@ -70,7 +70,9 @@ main (int argc, char **argv)
 {
   gaainfo info;
   int ret;
+#ifndef _WIN32
   struct passwd *pwd;
+#endif
   unsigned char key[MAX_KEY_SIZE];
   char hex_key[MAX_KEY_SIZE * 2 + 1];
   gnutls_datum_t dkey;
diff --git a/src/serv.c b/src/serv.c
index 068762438d..1c9071547b 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -1056,7 +1056,9 @@ main (int argc, char **argv)
     {
       listener_item *j;
       fd_set rd, wr;
+#ifndef _WIN32
       int val;
+#endif
 
       FD_ZERO (&rd);
       FD_ZERO (&wr);
diff --git a/src/tests.c b/src/tests.c
index 7fb9e2b206..d8448000b2 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -388,9 +388,10 @@ test_bye (gnutls_session_t session)
 {
   int ret;
   char data[20];
-  int old, secs = 6;
-
+  int secs = 6;
 #ifndef _WIN32
+  int old;
+
   signal (SIGALRM, got_alarm);
 #endif