Respun configure for richtext library

[wxWidgets.git] / src / common / socket.cpp

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 048fe30407062d7cb71e4c528a9b4e5333b39b95..11d97cccc433cba57f797ac6e210cf7ed3179f2e 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -32,10 +32,10 @@
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/utils.h"

+    #include "wx/timer.h"

 #endif
 
 #include "wx/apptrait.h"
 #endif
 
 #include "wx/apptrait.h"

-#include "wx/timer.h"

 #include "wx/module.h"
 
 #include "wx/sckaddr.h"
 #include "wx/module.h"
 
 #include "wx/sckaddr.h"


@@ -330,11 +330,9 @@ wxUint32 wxSocketBase::_Read(void* buffer, wxUint32 nbytes)
 
   // Return now in one of the following cases:
   // - the socket is invalid,
 
   // Return now in one of the following cases:
   // - the socket is invalid,

-  // - we got all the data,
-  // - we got *some* data and we are not using wxSOCKET_WAITALL.
+  // - we got all the data

   if ( !m_socket ||
   if ( !m_socket ||

-       !nbytes ||
-       ((total != 0) && !(m_flags & wxSOCKET_WAITALL)) )
+       !nbytes )

     return total;
 
   // Possible combinations (they are checked in this order)
     return total;
 
   // Possible combinations (they are checked in this order)