1. implemented wxRegKey::Copy() and CopyValue()

[wxWidgets.git] / src / msw / gsocket.c

diff --git a/src/msw/gsocket.c b/src/msw/gsocket.c
index 77f26dade1d5e04340660fe0f5107f00683fa38d..66dc5acfc64060b81381a7ecfb72c664d3ae57fb 100644 (file)
--- a/src/msw/gsocket.c
+++ b/src/msw/gsocket.c
@@ -46,7 +46,11 @@
 #include <ctype.h>
 #include <winsock.h>
 
+/* if we use configure for MSW SOCKLEN_T will be already defined */
+#ifndef SOCKLEN_T
 #define SOCKLEN_T  int
+#endif
+
 #define CLASSNAME  "_GSocket_Internal_Window_Class"
 #define WINDOWNAME "_GSocket_Internal_Window_Name"
 
@@ -766,23 +770,9 @@ int GSocket_Write(GSocket *socket, const char *buffer, int size)
  */
 GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
 {
-  GSocketEventFlags result = 0;
-
   assert(socket != NULL);
 
-  result = flags & socket->m_detected;
-
-  /* Explicitly check for input events */
-  if ((flags & GSOCK_INPUT_FLAG) && (socket->m_fd != INVALID_SOCKET))
-  {
-    u_long arg = 0;
-    int ret    = ioctlsocket(socket->m_fd, FIONREAD, (u_long FAR *) &arg);
-
-    if ((ret == 0) && (arg > 0))
-      result |= GSOCK_INPUT_FLAG;
-  }
-
-  return result;
+  return flags & socket->m_detected;
 }
 
 /* Attributes */