Update copyright notice

[empserver] / src / client / misc.h

diff --git a/src/client/misc.h b/src/client/misc.h
index 75d455ea84083f616876cf2da3917ef4454da3e8..d064a6ac0cfa8784937f144921a87eb8ee4ba764 100644 (file)
--- a/src/client/misc.h
+++ b/src/client/misc.h
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2013, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -35,9 +34,6 @@
 #define MISC_H
 
 #include <stdio.h>
-#ifdef _WIN32
-#include "sysdep_w32.h"
-#endif
 
 #define MAX(a, b) ((a) >= (b) ? (a) : (b))
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
@@ -48,14 +44,17 @@ extern int eight_bit_clean;
 extern int input_fd;
 extern int send_eof;
 extern FILE *auxfp;
-extern char *SO;
-extern char *SE;
 
-#ifndef _WIN32
+#ifdef HAVE_CURSES_TERMINFO
 void getsose(void);
 void putso(void);
 void putse(void);
-#endif
+#else  /* !HAVE_CURSES_TERMINFO */
+#define getsose() ((void)0)
+#define putso() ((void)0)
+#define putse() ((void)0)
+#endif /* !HAVE_CURSES_TERMINFO */
+
 int recvline(int s, char *buf);
 int parseid(char *);
 int expect(int s, int match, char *buf);
@@ -66,4 +65,10 @@ void sendcmd(int s, char *cmd, char *arg);
 void servercmd(int, char *, int);
 void outch(char);
 
+#ifdef _MSC_VER
+#define pclose _pclose
+#define popen _popen
+#define snprintf _snprintf
+#endif
+
 #endif