From: Guillermo Rodriguez Garcia <guille@iies.es>
Date: Tue, 29 Feb 2000 21:12:34 +0000 (+0000)
Subject: Beginning the thread with _beginthreadex but ending with ExitThread is not a good... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e02567553f9e3da5689876504d59df647476dcab

Beginning the thread with _beginthreadex but ending with ExitThread is not a good thing.


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

diff --git a/src/msw/thread.cpp b/src/msw/thread.cpp
index 0794203d43..27b948f785 100644
--- a/src/msw/thread.cpp
+++ b/src/msw/thread.cpp
@@ -26,7 +26,7 @@
 #endif
 
 #ifndef WX_PRECOMP
-    #include "wx/wx.h"
+#    include "wx/wx.h"
 #endif
 
 #if wxUSE_THREADS
@@ -36,12 +36,18 @@
 #include "wx/module.h"
 #include "wx/thread.h"
 
+#ifdef Yield
+#    undef Yield
+#endif
+
 // must have this symbol defined to get _beginthread/_endthread declarations
 #ifndef _MT
     #define _MT
 #endif
 
-#if defined(__VISUALC__) || (defined(__BORLANDC__) && (__BORLANDC__ >= 0x500))
+#if defined(__VISUALC__) || \
+    (defined(__BORLANDC__) && (__BORLANDC__ >= 0x500)) || \
+    (defined(__GNUG__) && defined(__MSVCRT__))
 
 #if defined(__BORLANDC__) && !defined(__MT__)
 // I can't set -tWM in the IDE (anyone?) so have to do this
@@ -53,7 +59,6 @@
 #define __MFC_COMPAT__
 #endif
 
-
     #include <process.h>
 #endif
 
@@ -926,7 +931,9 @@ void wxThread::Exit(ExitCode status)
         delete this;
     }
 
-#if defined(__VISUALC__) || (defined(__BORLANDC__) && (__BORLANDC__ >= 0x500))
+#if defined(__VISUALC__) || \
+    (defined(__BORLANDC__) && (__BORLANDC__ >= 0x500)) || \
+    (defined(__GNUG__) && defined(__MSVCRT__))
     _endthreadex((unsigned)status);
 #else // !VC++
     ::ExitThread((DWORD)status);