[_WIN32] Provide POSIX-style sys/socket.h. Use it rather than

winsock2.h.

diff --git a/src/lib/gen/io.c b/src/lib/gen/io.c
index ef83f6dd70c75eb2c0a7884b6bfc11b0f8be48b0..61c21d91d2df36ba9a0d616171e6855e197e534e 100644 (file)
--- a/src/lib/gen/io.c
+++ b/src/lib/gen/io.c
@@ -45,13 +45,11 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <sys/types.h>
-#ifdef _WIN32
-#include <winsock2.h>
-#else
+#if !defined(_WIN32)
 #include <sys/uio.h>
 #include <sys/file.h>
-#include <sys/socket.h>
 #endif
+#include <sys/socket.h>
 #include <unistd.h>
 #include <time.h>
 

diff --git a/src/lib/gen/tcp_listen.c b/src/lib/gen/tcp_listen.c
index 909dec5eaadae18d08a672a2f634388f13919fc1..2ec839edd860430385f0a71937498da98349cf38 100644 (file)
--- a/src/lib/gen/tcp_listen.c
+++ b/src/lib/gen/tcp_listen.c
@@ -38,17 +38,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef _WIN32
-#include "winsock2.h"
-#undef NS_ALL
-#else
 #include <sys/types.h>
 #include <sys/socket.h>
+#if !defined(_WIN32)
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-#include <unistd.h>
 #endif
+#include <unistd.h>
 #include "prototypes.h"
 
 static void cant_listen(char *, char *, const char *);

diff --git a/src/lib/player/accept.c b/src/lib/player/accept.c
index 8805bbecc4016e459beb78a94743fd2c3344d242..f01b7f87294d2e1f6c4f09d4c1a03a0a318ae572 100644 (file)
--- a/src/lib/player/accept.c
+++ b/src/lib/player/accept.c
@@ -34,12 +34,9 @@
 
 #include <config.h>
 
-#ifdef _WIN32
-#include <winsock2.h>
-#undef NS_ALL
-#else
 #include <sys/types.h>
 #include <sys/socket.h>
+#if !defined(_WIN32)
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>

diff --git a/src/lib/w32/sys/socket.h b/src/lib/w32/sys/socket.h
new file mode 100644 (file)
index 0000000..81f2902
--- /dev/null
+++ b/src/lib/w32/sys/socket.h
@@ -0,0 +1,40 @@
+/*
+ *  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.
+ *
+ *  ---
+ *
+ *  sys/socket.h: POSIX socket emulation for WIN32
+ * 
+ *  Known contributors to this file:
+ *     Ron Koenderink, 2007
+ */
+
+#ifndef SYS_SOCKET_H
+#define SYS_SOCKET_H
+
+#include <winsock2.h>
+#undef NS_ALL
+
+#endif /* SYS_SOCKET_H */