Real unistd.h declares getopt() & friends. Approximate that in

src/lib/w32/unistd.h by including getopt.h.  Simplify users

diff --git a/src/lib/w32/unistd.h b/src/lib/w32/unistd.h
new file mode 100644 (file)
index 0000000..e640f52
--- /dev/null
+++ b/src/lib/w32/unistd.h
@@ -0,0 +1,38 @@
+/*
+ *  Empire - A multi-player, client/server Internet based war game.
+ *  Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                           Ken Stevens, Steve McClure
+ *
+ *  This program 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
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  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
+ *
+ *  ---
+ *
+ *  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.
+ *
+ *  ---
+ *
+ *  unistd.h: POSIX emulation for WIN32
+ * 
+ *  Known contributors to this file:
+ *     Ron Koenderink, 2007
+ */
+
+#ifndef UNISTD_H
+#define UNISTD_H
+
+#include "getopt.h"
+#endif /* UNISTD_H */

diff --git a/src/server/main.c b/src/server/main.c
index f91db585b9bdbe9f8a88d701f55579c891acae5c..47c656234ec7137e728876f5cc46ad5918df6eb1 100644 (file)
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -45,13 +45,12 @@
 #include <winsock2.h>
 #undef NS_ALL
 #include <direct.h>
-#include <getopt.h>
 #include <process.h>
 #include "service.h"
 #else
 #include <sys/types.h>
-#include <unistd.h>
 #endif
+#include <unistd.h>
 
 #include "empio.h"
 #include "empthread.h"

diff --git a/src/util/empsched.c b/src/util/empsched.c
index 4907bd6a1a65ee0d528585a20ff2b5db48ef2032..5c499c378b4d5bfb3627e2f9e5b48da83ad26611 100644 (file)
--- a/src/util/empsched.c
+++ b/src/util/empsched.c
@@ -33,11 +33,7 @@
 
 #include <config.h>
 
-#if defined(_WIN32)
-#include <getopt.h>
-#else
 #include <unistd.h>
-#endif
 #include <stdio.h>
 #include <time.h>
 #include "optlist.h"

diff --git a/src/util/fairland.c b/src/util/fairland.c
index 3b26d894d41e08343b2a5d632a31da6a84fe22c4..afceb3abb658157f2ba98273ce00c9e1e92c3e25 100644 (file)
--- a/src/util/fairland.c
+++ b/src/util/fairland.c
@@ -66,11 +66,7 @@ static int quiet = 0;
 /* lower URAN_MIN for more uranium */
 #define URAN_MIN   56
 
-#if defined(_WIN32)
-#include <getopt.h>
-#else
 #include <unistd.h>
-#endif
 
 #include <errno.h>
 #include <stdarg.h>

diff --git a/src/util/files.c b/src/util/files.c
index 76489e849cbe09056538420cb1581474748ae611..ab214723f1e98cda01dc3c367ff136a61d3690f5 100644 (file)
--- a/src/util/files.c
+++ b/src/util/files.c
@@ -40,11 +40,8 @@
 #include <errno.h>
 #if defined(_WIN32)
 #include <direct.h>
-#include <getopt.h>
-#include <io.h>
-#else
-#include <unistd.h>
 #endif
+#include <unistd.h>
 
 #include "file.h"
 #include "game.h"