Compilaton fixes.

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

diff --git a/src/msw/gsockmsw.c b/src/msw/gsockmsw.c
index 60d54c682c1395e96269dc8bda9de8e48a0ae646..5016995a452473806e39bafc0a1fd2ad6f6217f6 100644 (file)
--- a/src/msw/gsockmsw.c
+++ b/src/msw/gsockmsw.c
@@ -7,6 +7,14 @@
  * -------------------------------------------------------------------------
  */
 
  * -------------------------------------------------------------------------
  */
 

+/*
+ * TODO: for WinCE we need to replace WSAAsyncSelect
+ * (Windows message-based notification of network events for a socket)
+ * with another mechanism.
+ * We may need to have a separate thread that polls for socket events
+ * using select() and sends a message to the main thread.
+ */
+

 /*
  * PLEASE don't put C++ comments here - this is a C source file.
  */
 /*
  * PLEASE don't put C++ comments here - this is a C source file.
  */


@@ -19,6 +27,14 @@
 #  pragma warning(disable:4115) /* named type definition in parentheses */
 #endif
 
 #  pragma warning(disable:4115) /* named type definition in parentheses */
 #endif
 

+/* This needs to be before the wx/defs/h inclusion
+ * for some reason
+ */
+
+#ifdef __WXWINCE__
+#include <windows.h>
+#endif
+

 #ifndef __GSOCKET_STANDALONE__
 #include "wx/defs.h"
 #include "wx/setup.h"
 #ifndef __GSOCKET_STANDALONE__
 #include "wx/defs.h"
 #include "wx/setup.h"


@@ -46,7 +62,14 @@
 
 #endif /* __GSOCKET_STANDALONE__ */
 
 
 #endif /* __GSOCKET_STANDALONE__ */
 

+#ifndef __WXWINCE__

 #include <assert.h>
 #include <assert.h>

+#else
+#define assert(x)
+#include <winsock.h>
+#include "wx/msw/wince/net.h"
+#endif
+

 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>


@@ -59,8 +82,8 @@
 #  pragma warning(default:4115) /* named type definition in parentheses */
 #endif
 
 #  pragma warning(default:4115) /* named type definition in parentheses */
 #endif
 

-#define CLASSNAME  "_GSocket_Internal_Window_Class"
-#define WINDOWNAME "_GSocket_Internal_Window_Name"
+#define CLASSNAME  TEXT("_GSocket_Internal_Window_Class")
+#define WINDOWNAME TEXT("_GSocket_Internal_Window_Name")

 
 /* Maximum number of different GSocket objects at a given time.
  * This value can be modified at will, but it CANNOT be greater
 
 /* Maximum number of different GSocket objects at a given time.
  * This value can be modified at will, but it CANNOT be greater


@@ -188,7 +211,7 @@ LRESULT CALLBACK _GSocket_Internal_WinProc(HWND hWnd,
   {
     EnterCriticalSection(&critical);
     socket = socketList[(uMsg - WM_USER)];
   {
     EnterCriticalSection(&critical);
     socket = socketList[(uMsg - WM_USER)];

-    event = -1;
+    event = (GSocketEvent) -1;

     cback = NULL;
     data = NULL;
 
     cback = NULL;
     data = NULL;
 


@@ -283,6 +306,6 @@ void _GSocket_Disable_Events(GSocket *socket)
  * Translation unit shouldn't be empty, so include this typedef to make the
  * compiler (VC++ 6.0, for example) happy
  */
  * Translation unit shouldn't be empty, so include this typedef to make the
  * compiler (VC++ 6.0, for example) happy
  */

-typedef (*wxDummy)();
+typedef void (*wxDummy)();

 
 #endif  /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */
 
 #endif  /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */