[Wesnoth-cvs-commits] wesnoth ./wesnoth.dsp src/network_worker.cpp sr...

[David White]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     David White <address@hidden>    04/10/15 20:24:02

Modified files:
        .              : wesnoth.dsp 
        src            : network_worker.cpp thread.cpp 

Log message:
        made work in Windows

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/wesnoth.dsp.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/network_worker.cpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/thread.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: wesnoth/src/network_worker.cpp
diff -u wesnoth/src/network_worker.cpp:1.3 wesnoth/src/network_worker.cpp:1.4
--- wesnoth/src/network_worker.cpp:1.3  Tue Oct 12 23:13:17 2004
+++ wesnoth/src/network_worker.cpp      Fri Oct 15 20:24:02 2004
@@ -8,8 +8,6 @@
 #include <map>
 #include <set>
 
-#include <unistd.h>
-
 namespace {
 
 unsigned int buf_id = 0;
Index: wesnoth/src/thread.cpp
diff -u wesnoth/src/thread.cpp:1.1 wesnoth/src/thread.cpp:1.2
--- wesnoth/src/thread.cpp:1.1  Mon Oct 11 23:46:40 2004
+++ wesnoth/src/thread.cpp      Fri Oct 15 20:24:02 2004
@@ -54,12 +54,12 @@
 
 bool condition::wait(const mutex& m)
 {
-       SDL_CondWait(cond_,m.m_);
+       return SDL_CondWait(cond_,m.m_) == 0;
 }
 
 bool condition::wait_timeout(const mutex& m, unsigned int timeout)
 {
-       SDL_CondWaitTimeout(cond_,m.m_,timeout);
+       return SDL_CondWaitTimeout(cond_,m.m_,timeout) == 0;
 }
 
 void condition::notify_one()
Index: wesnoth/wesnoth.dsp
diff -u wesnoth/wesnoth.dsp:1.13 wesnoth/wesnoth.dsp:1.14
--- wesnoth/wesnoth.dsp:1.13    Sun Aug 22 22:50:13 2004
+++ wesnoth/wesnoth.dsp Fri Oct 15 20:24:02 2004
@@ -261,10 +261,18 @@
 # End Source File
 # Begin Source File
 
+SOURCE=.\src\network_worker.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\pathfind.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\src\pathutils.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\playlevel.cpp
 # End Source File
 # Begin Source File
@@ -281,6 +289,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=.\src\publish_campaign.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\race.cpp
 # End Source File
 # Begin Source File
@@ -337,6 +349,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=.\src\thread.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\titlescreen.cpp
 # End Source File
 # Begin Source File