X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/44c2703fbf07a5685d1959f3f72d3ccf91a7f5db..9ac34ac9156ea40ad76025aedb6eef86b2a813cc:/src/common/socket.cpp

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 923dff0d49..228fe79a28 100644
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -1109,6 +1109,9 @@ wxSocketBase& wxSocketBase::Peek(void* buffer, wxUint32 nbytes)
 {
     wxSocketReadGuard read(this);
 
+    // Peek() should never block
+    wxSocketWaitModeChanger changeFlags(this, wxSOCKET_NOWAIT);
+
     m_lcount = DoRead(buffer, nbytes);
 
     Pushback(buffer, m_lcount);
@@ -2096,7 +2099,7 @@ wxFORCE_LINK_MODULE( socketiohandler )
 #endif
 
 // and for OSXManagerSetter in the OS X one
-#ifdef __WXMAC__
+#ifdef __WXOSX__
     wxFORCE_LINK_MODULE( osxsocket )
 #endif