X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b9697cb4104c115d39d10915b47e2381938020e0..db51298a741c46719a70884f750befc3b5749036:/include/wx/thread.h diff --git a/include/wx/thread.h b/include/wx/thread.h index 9718c3998e..7ee8361ee9 100644 --- a/include/wx/thread.h +++ b/include/wx/thread.h @@ -219,7 +219,7 @@ private: // in order to avoid any overhead under platforms where critical sections are // just mutexes make all wxCriticalSection class functions inline -#if !defined(__WXMSW__) +#if !defined(__WINDOWS__) #define wxCRITSECT_IS_MUTEX 1 #define wxCRITSECT_INLINE WXEXPORT inline @@ -258,7 +258,7 @@ public: private: #if wxCRITSECT_IS_MUTEX wxMutex m_mutex; -#elif defined(__WXMSW__) +#elif defined(__WINDOWS__) // we can't allocate any memory in the ctor, so use placement new - // unfortunately, we have to hardcode the sizeof() here because we can't // include windows.h from this public header and we also have to use the @@ -844,7 +844,7 @@ public: #if wxUSE_THREADS -#if defined(__WXMSW__) || defined(__OS2__) || defined(__EMX__) || defined(__WXOSX__) +#if defined(__WINDOWS__) || defined(__OS2__) || defined(__EMX__) || defined(__WXOSX__) // unlock GUI if there are threads waiting for and lock it back when // there are no more of them - should be called periodically by the main // thread