Fixed Yield/Windows clash in sckint.cpp, updated makefile

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/vc.rsp b/distrib/msw/vc.rsp
index 2b99cc94d30e8510abd235439ddd9bed69eab093..821c749a809f6a9c17192186a1b98a3543bb90c2 100644 (file)
--- a/distrib/msw/vc.rsp
+++ b/distrib/msw/vc.rsp
@@ -1,5 +1,7 @@
 src/wxvc.dsp
 src/wxvc.dsw
+src/wxvc6.dsp
+src/wxvc6.dsw
 src/wxvc_dll.dsp
 src/wxvc_dll.dsw
 

diff --git a/src/common/sckint.cpp b/src/common/sckint.cpp
index fe0a8ee7dcbddb022e865c06db172b8ae6de0e1f..a8699b5859995f1a99b29a99b5181e0ec6c487d0 100644 (file)
--- a/src/common/sckint.cpp
+++ b/src/common/sckint.cpp
@@ -155,11 +155,23 @@ void *SocketWaiter::Entry()
     if (FD_ISSET(m_fd, &sockwr_set))
       ProcessWriteEvent();
 
+#if wxUSE_THREADS
+#ifdef Yield
+#undef Yield
+#endif
+
     if (ret == 0)
       // If nothing happened, we wait for 100 ms.
       wxThread::Sleep(10);
     else
       wxThread::Yield();
+#else
+    if (ret == 0)
+      // If nothing happened, we wait for 100 ms.
+      wxUsleep(10);
+    else
+      wxYield();
+#endif
 
     // Check whether we should exit.
     if (TestDestroy())

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index e5f0d9eff47b4b72e40b793d19d7b739e83b4375..fe713b0eaa1aa1092cb8fe1575ec2f70735bd911 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -141,8 +141,8 @@ COMMONOBJS = \
   ..\common\$D\paper.obj \
   ..\common\$D\string.obj \
   ..\common\$D\socket.obj \
-  ..\common\$D\socket.obj \
   ..\common\$D\sckaddr.obj \
+  ..\common\$D\sckint.obj \
   ..\common\$D\sckfile.obj \
   ..\common\$D\sckipc.obj \
   ..\common\$D\sckstrm.obj \