[Wesnoth-cvs-commits] wesnoth/src network.cpp

[Jon Daniel]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Jon Daniel <address@hidden>     05/08/20 19:12:04

Modified files:
        src            : network.cpp 

Log message:
        applied patch from ahwayakchih changing BEOS into __BEOS__

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/network.cpp.diff?tr1=1.78&tr2=1.79&r1=text&r2=text

Patches:
Index: wesnoth/src/network.cpp
diff -u wesnoth/src/network.cpp:1.78 wesnoth/src/network.cpp:1.79
--- wesnoth/src/network.cpp:1.78        Wed Aug 17 22:03:47 2005
+++ wesnoth/src/network.cpp     Sat Aug 20 19:12:01 2005
@@ -1,4 +1,4 @@
-/* $Id: network.cpp,v 1.78 2005/08/17 22:03:47 j_daniel Exp $ */
+/* $Id: network.cpp,v 1.79 2005/08/20 19:12:01 j_daniel Exp $ */
 /*
    Copyright (C) 2003-5 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -38,7 +38,11 @@
 #else
 #include <sys/types.h>
 #include <sys/socket.h>
+#ifdef __BEOS__
+#include <socket.h>
+#else
 #include <fcntl.h>
+#endif
 #define SOCKET int
 #endif
 
@@ -313,7 +317,7 @@
                unsigned long mode = 1;
                ioctlsocket (((_TCPsocket*)sock)->channel, FIONBIO, &mode);
        }
-#elif !defined(BEOS)
+#elif !defined(__BEOS__)
        int flags;
        flags = fcntl(((_TCPsocket*)sock)->channel, F_GETFL, 0);
 #if defined(O_NONBLOCK)