A fix for attribrute sorting, but it's still broken if there are

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

diff --git a/include/wx/msw/gsockmsw.h b/include/wx/msw/gsockmsw.h
index 6c3befccb5064917f053cb7fe46f2ea324b0251f..c558049e1ff9f6232114271183ab0b2fd1bf82e5 100644 (file)
--- a/include/wx/msw/gsockmsw.h
+++ b/include/wx/msw/gsockmsw.h
@@ -21,14 +21,22 @@
 #include "gsocket.h"
 #endif
 
 #include "gsocket.h"
 #endif
 

+#include <windows.h>

 #include <winsock.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #include <winsock.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 

+#ifndef TRUE
+#define TRUE 1
+#endif
+
+#ifndef FALSE
+#define FALSE 0
+#endif
+

 /* Definition of GSocket */
 /* Definition of GSocket */

-typedef

 struct _GSocket
 {
   SOCKET m_fd;
 struct _GSocket
 {
   SOCKET m_fd;


@@ -37,10 +45,11 @@ struct _GSocket
   GSocketError m_error;
 
   /* Attributes */
   GSocketError m_error;
 
   /* Attributes */

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

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


@@ -62,11 +71,11 @@ struct _GAddress
   GSocketError m_error;
 };
 
   GSocketError m_error;
 };
 

-

 /* Input / output */
 
 GSocketError _GSocket_Input_Timeout(GSocket *socket);
 GSocketError _GSocket_Output_Timeout(GSocket *socket);
 /* Input / output */
 
 GSocketError _GSocket_Input_Timeout(GSocket *socket);
 GSocketError _GSocket_Output_Timeout(GSocket *socket);

+GSocketError _GSocket_Connect_Timeout(GSocket *socket);

 int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size);
 int _GSocket_Recv_Dgram(GSocket *socket, char *buffer, int size);
 int _GSocket_Send_Stream(GSocket *socket, const char *buffer, int size);
 int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size);
 int _GSocket_Recv_Dgram(GSocket *socket, char *buffer, int size);
 int _GSocket_Send_Stream(GSocket *socket, const char *buffer, int size);


@@ -74,18 +83,20 @@ int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size);
 
 /* Callbacks */
 
 
 /* Callbacks */
 

+int  _GSocket_GUI_Init(GSocket *socket);
+void _GSocket_GUI_Destroy(GSocket *socket);
+
+LRESULT CALLBACK _GSocket_Internal_WinProc(HWND, UINT, WPARAM, LPARAM);
+

 void _GSocket_Enable_Events(GSocket *socket);
 void _GSocket_Disable_Events(GSocket *socket);
 void _GSocket_Enable_Events(GSocket *socket);
 void _GSocket_Disable_Events(GSocket *socket);

-LRESULT CALLBACK _GSocket_Internal_WinProc(HWND, UINT, WPARAM, LPARAM);

 
 /* GAddress */
 
 GSocketError _GAddress_translate_from(GAddress *address,
                                       struct sockaddr *addr, int len);
 
 /* GAddress */
 
 GSocketError _GAddress_translate_from(GAddress *address,
                                       struct sockaddr *addr, int len);

-
-GSocketError _GAddress_translate_to(GAddress *address,
-                                    struct sockaddr **addr, int *len);
-
+GSocketError _GAddress_translate_to  (GAddress *address,
+                                      struct sockaddr **addr, int *len);

 GSocketError _GAddress_Init_INET(GAddress *address);
 GSocketError _GAddress_Init_UNIX(GAddress *address);
 
 GSocketError _GAddress_Init_INET(GAddress *address);
 GSocketError _GAddress_Init_UNIX(GAddress *address);