CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Jon Daniel <[EMAIL PROTECTED]> 05/09/06 17:10:15
Modified files:
src : network_worker.cpp
Log message:
Use select for win32 this way we don't have to define any HAVE_FOOBAR_H
for windows
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/network_worker.cpp.diff?tr1=1.50&tr2=1.51&r1=text&r2=text
Patches:
Index: wesnoth/src/network_worker.cpp
diff -u wesnoth/src/network_worker.cpp:1.50 wesnoth/src/network_worker.cpp:1.51
--- wesnoth/src/network_worker.cpp:1.50 Tue Sep 6 13:53:14 2005
+++ wesnoth/src/network_worker.cpp Tue Sep 6 17:10:15 2005
@@ -1,4 +1,4 @@
-/* $Id: network_worker.cpp,v 1.50 2005/09/06 13:53:14 ott Exp $ */
+/* $Id: network_worker.cpp,v 1.51 2005/09/06 17:10:15 j_daniel Exp $ */
/*
Copyright (C) 2003-5 by David White <[EMAIL PROTECTED]>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -30,6 +30,7 @@
#if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
#include <windows.h>
+#define USE_SELECT
#else
#include <sys/types.h>
#include <sys/socket.h>
@@ -39,8 +40,6 @@
#include <fcntl.h>
#endif
#define SOCKET int
-#endif
-
#ifdef HAVE_POLL_H
#define USE_POLL 1
#include <poll.h>
@@ -59,6 +58,8 @@
#include <unistd.h>
#endif
#endif
+#endif
+
#define LOG_NW LOG_STREAM(info, network)
#define ERR_NW LOG_STREAM(err, network)
