COPYING duplicates information from README. Remove. Move GPL from

[empserver] / src / client / misc.h

diff --git a/src/client/misc.h b/src/client/misc.h
index ec0f21fe0e32e9b436efdc249052ab0dc308b84a..58e3dd6d8654fc194034789bc87e0fed59e081e3 100644 (file)
--- a/src/client/misc.h
+++ b/src/client/misc.h
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
@@ -31,8 +31,8 @@
  *     Steve McClure, 1998
  */
 
-#ifndef _MISC_H_
-#define _MISC_H_
+#ifndef MISC_H
+#define MISC_H
 
 #include <ctype.h>
 #include <stdio.h>
@@ -50,25 +50,33 @@ struct ioqueue;
 
 extern char empirehost[];
 extern char empireport[];
-extern int interrupt;
+extern int eight_bit_clean;
 extern char num_teles[];
 extern int sock;
 extern char *SO;
 extern char *SE;
 
 #ifdef _WIN32
-HANDLE hStdIn;
+extern HANDLE hStdIn;
 #endif
 
+#ifdef _WIN32
+#define getsose() ((void)0)
+#define putso() ((void)0)
+#define putse() ((void)0)
+#define pclose _pclose
+#define popen _popen
+#else
 void getsose(void);
+void putso(void);
+void putse(void);
+#endif
+int recvline(int s, char *buf);
 int expect(int s, int match, char *buf);
-int handleintr(int);
-int hostaddr(char *name, struct sockaddr_in *addr);
-int hostconnect(struct sockaddr_in *addr);
-int hostport(char *name, struct sockaddr_in *addr);
-int login(int s, char *uname, char *cname, char *cpass, int kill_proc);
+int tcp_connect(char *, char *);
+int login(int s, char *uname, char *cname, char *cpass, int kill_proc, int);
 void saveargv(int ac, char **src, char **dst);
-void sendcmd(int s, int cmd, char *arg);
+void sendcmd(int s, char *cmd, char *arg);
 int sendeof(int sock);
 void servercmd(struct ioqueue *ioq, FILE *auxfi);
 int serverio(int s, struct ioqueue *ioq);