wxDefaultSize.* and wxDefaultPosition.* to wxDefaultCoord.

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

diff --git a/src/msw/gsocket.c b/src/msw/gsocket.c
index 9eb8d695138a1d2882960db67ce807148f5f73cf..4d6e01f6245a65492f5cc66a1da02d41e3731229 100644 (file)
--- a/src/msw/gsocket.c
+++ b/src/msw/gsocket.c
@@ -3,7 +3,7 @@
  * Name:    gsocket.c
  * Author:  Guillermo Rodriguez Garcia <guille@iies.es>
  * Purpose: GSocket main MSW file
  * Name:    gsocket.c
  * Author:  Guillermo Rodriguez Garcia <guille@iies.es>
  * Purpose: GSocket main MSW file

- * Licence: The wxWindows licence
+ * Licence: The wxWidgets licence

  * CVSID:   $Id$
  * -------------------------------------------------------------------------
  */
  * CVSID:   $Id$
  * -------------------------------------------------------------------------
  */


@@ -25,6 +25,19 @@
     * warning: unreferenced formal parameter.
     */
 #  pragma warning(disable:4100)
     * warning: unreferenced formal parameter.
     */
 #  pragma warning(disable:4100)

+
+#ifdef __WXWINCE__
+    /* windows.h results in tons of warnings at max warning level */
+#   ifdef _MSC_VER
+#       pragma warning(push, 1)
+#   endif
+#   include <windows.h>
+#   ifdef _MSC_VER
+#       pragma warning(pop)
+#       pragma warning(disable:4514)
+#   endif
+#endif
+

 #endif /* _MSC_VER */
 
 #include <winsock.h>
 #endif /* _MSC_VER */
 
 #include <winsock.h>


@@ -771,7 +784,7 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
     FD_ZERO(&writefds);
     FD_ZERO(&exceptfds);
     FD_SET(socket->m_fd, &readfds);
     FD_ZERO(&writefds);
     FD_ZERO(&exceptfds);
     FD_SET(socket->m_fd, &readfds);

-       if (flags & GSOCK_OUTPUT_FLAG)
+    if (flags & GSOCK_OUTPUT_FLAG || flags & GSOCK_CONNECTION_FLAG)

       FD_SET(socket->m_fd, &writefds);
     FD_SET(socket->m_fd, &exceptfds);
 
       FD_SET(socket->m_fd, &writefds);
     FD_SET(socket->m_fd, &exceptfds);
 


@@ -790,7 +803,7 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
 
     /* Try select now */
     if (select(socket->m_fd + 1, &readfds, &writefds, &exceptfds,
 
     /* Try select now */
     if (select(socket->m_fd + 1, &readfds, &writefds, &exceptfds,

-           &socket->m_timeout) <= 0)
+        &socket->m_timeout) <= 0)

     {
       /* What to do here? */
       return (result & flags);
     {
       /* What to do here? */
       return (result & flags);


@@ -1352,7 +1365,7 @@ GSocketError GAddress_INET_SetHostAddress(GAddress *address,
   CHECK_ADDRESS(address, INET);
 
   addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);
   CHECK_ADDRESS(address, INET);
 
   addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);

-  addr->s_addr = hostaddr;
+  addr->s_addr = htonl(hostaddr);;

 
   return GSOCK_NOERROR;
 }
 
   return GSOCK_NOERROR;
 }


@@ -1441,7 +1454,7 @@ unsigned long GAddress_INET_GetHostAddress(GAddress *address)
 
   addr = (struct sockaddr_in *)address->m_addr;
 
 
   addr = (struct sockaddr_in *)address->m_addr;
 

-  return addr->sin_addr.s_addr;
+  return ntohl(addr->sin_addr.s_addr);

 }
 
 unsigned short GAddress_INET_GetPort(GAddress *address)
 }
 
 unsigned short GAddress_INET_GetPort(GAddress *address)