Fixes for WinCE build caused by my last commit.

[wxWidgets.git] / include / wx / msw / gsockmsw.h

diff --git a/include/wx/msw/gsockmsw.h b/include/wx/msw/gsockmsw.h
index 84a6598e4df324357756476807392ef0da7321ea..859ed60513acd8ced9c68286fe871d922c2d6da9 100644 (file)
--- a/include/wx/msw/gsockmsw.h
+++ b/include/wx/msw/gsockmsw.h
@@ -1,8 +1,10 @@
 /* -------------------------------------------------------------------------
 /* -------------------------------------------------------------------------

- * Project: GSocket (Generic Socket) for WX
- * Name:    gsockmsw.h
- * Purpose: GSocket MSW header
- * CVSID:   $Id$
+ * Project:     GSocket (Generic Socket) for WX
+ * Name:        gsockmsw.h
+ * Copyright:   (c) Guilhem Lavaux
+ * Licence:     wxWindows Licence
+ * Purpose:     GSocket MSW header
+ * CVSID:       $Id$

  * -------------------------------------------------------------------------
  */
 
  * -------------------------------------------------------------------------
  */
 


@@ -23,12 +25,14 @@
 
 #include "wx/msw/wrapwin.h"
 
 
 #include "wx/msw/wrapwin.h"
 

-#ifndef TRUE
-#define TRUE 1
+#if defined(__CYGWIN__)
+    //CYGWIN gives annoying warning about runtime stuff if we don't do this
+#   define USE_SYS_TYPES_FD_SET
+#   include <sys/types.h>

 #endif
 
 #endif
 

-#ifndef FALSE
-#define FALSE 0
+#if defined(__WXWINCE__) || defined(__CYGWIN__)
+#include <winsock.h>

 #endif
 
 class GSocketGUIFunctionsTableConcrete: public GSocketGUIFunctionsTable
 #endif
 
 class GSocketGUIFunctionsTableConcrete: public GSocketGUIFunctionsTable


@@ -58,7 +62,7 @@ public:
   GAddress *GetPeer();
   GSocketError SetServer();
   GSocket *WaitConnection();
   GAddress *GetPeer();
   GSocketError SetServer();
   GSocket *WaitConnection();

-  int SetReusable();
+  bool SetReusable();

   GSocketError Connect(GSocketStream stream);
   GSocketError SetNonOriented();
   int Read(char *buffer, int size);
   GSocketError Connect(GSocketStream stream);
   GSocketError SetNonOriented();
   int Read(char *buffer, int size);


@@ -92,11 +96,11 @@ public:
   GSocketError m_error;
 
   /* Attributes */
   GSocketError m_error;
 
   /* Attributes */

-  int m_non_blocking;
-  int m_server;
-  int m_stream;
-  int m_establishing;
-  int m_reusable;
+  bool m_non_blocking;
+  bool m_server;
+  bool m_stream;
+  bool m_establishing;
+  bool m_reusable;

   struct timeval m_timeout;
 
   /* Callbacks */
   struct timeval m_timeout;
 
   /* Callbacks */


@@ -106,53 +110,6 @@ public:
   int m_msgnumber;
 };
 
   int m_msgnumber;
 };
 

-/* TODO: Fix src/common/socket.cpp to use the new API */
-inline void GSocket_Shutdown(GSocket *socket)
-{   socket->Shutdown(); }
-inline GSocketError GSocket_SetLocal(GSocket *socket, GAddress *address)
-{   return socket->SetLocal(address); }
-inline GSocketError GSocket_SetPeer(GSocket *socket, GAddress *address)
-{   return socket->SetPeer(address); }
-inline GAddress *GSocket_GetLocal(GSocket *socket)
-{   return socket->GetLocal(); }
-inline GAddress *GSocket_GetPeer(GSocket *socket)
-{   return socket->GetPeer(); }
-inline GSocketError GSocket_SetServer(GSocket *socket)
-{   return socket->SetServer(); }
-inline GSocket *GSocket_WaitConnection(GSocket *socket)
-{   return socket->WaitConnection(); }
-inline int GSocket_SetReusable(GSocket *socket)
-{   return socket->SetReusable(); }
-inline GSocketError GSocket_Connect(GSocket *socket, GSocketStream stream)
-{   return socket->Connect(stream); }
-inline GSocketError GSocket_SetNonOriented(GSocket *socket)
-{   return socket->SetNonOriented(); }
-inline int GSocket_Read(GSocket *socket, char *buffer, int size)
-{   return socket->Read(buffer,size); }
-inline int GSocket_Write(GSocket *socket, const char *buffer, int size)
-{   return socket->Write(buffer,size); }
-inline GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
-{   return socket->Select(flags); }
-inline void GSocket_SetNonBlocking(GSocket *socket, int non_block)
-{   socket->SetNonBlocking(non_block != 0); }
-inline void GSocket_SetTimeout(GSocket *socket, unsigned long millisec)
-{   socket->SetTimeout(millisec); }
-inline GSocketError GSocket_GetError(GSocket *socket)
-{   return socket->GetError(); }
-inline void GSocket_SetCallback(GSocket *socket, GSocketEventFlags flags,
-                         GSocketCallback fallback, char *cdata)
-{   socket->SetCallback(flags,fallback,cdata); }
-inline void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags)
-{   socket->UnsetCallback(flags); }
-inline GSocketError GSocket_GetSockOpt(GSocket *socket, int level, int optname,
-                        void *optval, int *optlen)
-{   return socket->GetSockOpt(level,optname,optval,optlen); }
-inline GSocketError GSocket_SetSockOpt(GSocket *socket, int level, int optname,
-                        const void *optval, int optlen)
-{   return socket->SetSockOpt(level,optname,optval,optlen); }
-inline void GSocket_destroy(GSocket *socket)
-{   delete socket; }
-

 #ifdef __cplusplus
 extern "C" {
 #endif
 #ifdef __cplusplus
 extern "C" {
 #endif