From 70190256155c4b5efcc9062bf29bb4ef6e1f4473 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Wed, 5 May 1999 11:45:20 +0000
Subject: [PATCH] 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
---
 distrib/msw/vc.rsp    |  2 ++
 src/common/sckint.cpp | 12 ++++++++++++
 src/msw/makefile.vc   |  2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/distrib/msw/vc.rsp b/distrib/msw/vc.rsp
index 2b99cc94d3..821c749a80 100644
--- 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 fe0a8ee7dc..a8699b5859 100644
--- 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 e5f0d9eff4..fe713b0eaa 100644
--- 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 \
-- 
2.45.2