From 7dbb87b0e096fac7738836532fd7c88634183c60 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Mon, 16 Feb 2004 17:44:38 +0000
Subject: [PATCH] Windows cleanup: include proper headers, remove unused
 variables, fix type of signal handler.  Mostly from Ron Koenderink.

---
 src/client/host.c     |  1 +
 src/client/main.c     | 17 ++++++-----------
 src/client/servcmd.c  |  2 ++
 src/client/serverio.c |  1 +
 src/client/termio.c   |  1 +
 src/client/termlib.c  |  6 ++----
 6 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/client/host.c b/src/client/host.c
index 00c91ceb..6900a937 100644
--- a/src/client/host.c
+++ b/src/client/host.c
@@ -43,6 +43,7 @@
 #include <netdb.h>
 #include <unistd.h>
 #else
+#include <io.h>
 #include <winsock.h>
 #endif
 #include <ctype.h>
diff --git a/src/client/main.c b/src/client/main.c
index 72a99177..5da18dc1 100644
--- a/src/client/main.c
+++ b/src/client/main.c
@@ -60,6 +60,7 @@
 #include <windows.h>
 #include <winsock.h>
 #include <conio.h>
+#include <io.h>
 #endif
 
 #ifdef _WIN32
@@ -85,6 +86,8 @@ int serverio();
 void servercmd();
 void ioq_drain();
 
+static void intr(int sig);
+
 
 int
 main(ac, av)
@@ -96,16 +99,12 @@ s_char *av[];
     int err;
     fd_set readfds;
     struct timeval tm;
-    INPUT_RECORD InpBuffer[10];
-    DWORD numevents;
     DWORD stdinmode;
     SECURITY_ATTRIBUTES security;
-    void intr(void);
 #endif
     extern s_char empireport[];
     extern s_char empirehost[];
     fd_set mask;
-    fd_set savemask;
     struct ioqueue server;
     s_char *argv[128];
     int i, j;
@@ -113,8 +112,8 @@ s_char *av[];
     s_char *auxout_fname;
     FILE *auxout_fp;
 #ifndef _WIN32
+    fd_set savemask;
     struct passwd *pwd;
-    void intr();
 #endif
     struct sockaddr_in sin;
     int n;
@@ -302,12 +301,8 @@ s_char *av[];
     return 0;			/* Shut the compiler up */
 }
 
-void
-#ifdef _WIN32
-intr(void)
-#else
-intr()
-#endif
+static void
+intr(int sig)
 {
     interrupt++;
 #ifdef hpux
diff --git a/src/client/servcmd.c b/src/client/servcmd.c
index 3bc04c56..60cbb166 100644
--- a/src/client/servcmd.c
+++ b/src/client/servcmd.c
@@ -44,6 +44,8 @@
 #include <fcntl.h>
 #if !defined(_WIN32)
 #include <unistd.h>
+#else
+#include <io.h>
 #endif
 
 extern s_char *gettag();
diff --git a/src/client/serverio.c b/src/client/serverio.c
index 29b79b8e..57d69936 100644
--- a/src/client/serverio.c
+++ b/src/client/serverio.c
@@ -44,6 +44,7 @@
 
 #ifdef _WIN32
 #include <winsock.h>
+#include <io.h>
 #endif
 
 void ioq_write();
diff --git a/src/client/termio.c b/src/client/termio.c
index 10760706..a5646c0e 100644
--- a/src/client/termio.c
+++ b/src/client/termio.c
@@ -46,6 +46,7 @@
 #include <sgtty.h>
 #else
 #include <winsock.h>
+#include <io.h>
 #endif /* _WIN32 */
 #endif
 #include "misc.h"
diff --git a/src/client/termlib.c b/src/client/termlib.c
index 86ff0c37..f5083fea 100644
--- a/src/client/termlib.c
+++ b/src/client/termlib.c
@@ -68,13 +68,11 @@ getsose()
 {
 #ifndef _WIN32
     extern s_char *tgetstr();
-#endif
-    static s_char tbuf[1024];
-    static s_char cbuf[20];
     s_char *cp;
     s_char *term;
+    static s_char tbuf[1024];
+    static s_char cbuf[20];
 
-#ifndef _WIN32
     memset((s_char *)&cbuf[0], 0, 20);
     term = getenv("TERM");
     if (term == 0) {