Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5969/wxLua/modules/wxluasocket/include
Modified Files:
wxldserv.h wxlsock.h
Log Message:
make sockets work again in MSW
Index: wxldserv.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldserv.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** wxldserv.h 28 Sep 2006 22:26:05 -0000 1.15
--- wxldserv.h 29 Sep 2006 20:47:15 -0000 1.16
***************
*** 171,175 ****
protected:
virtual void *Entry(); // thread execution starts here
! virtual void OnExit() {} // called when the thread exits
wxLuaDebuggerServer *m_pServer;
--- 171,175 ----
protected:
virtual void *Entry(); // thread execution starts here
! virtual void OnExit(); // called when the thread exits
wxLuaDebuggerServer *m_pServer;
Index: wxlsock.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxlsock.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** wxlsock.h 28 Sep 2006 22:26:05 -0000 1.14
--- wxlsock.h 29 Sep 2006 20:47:15 -0000 1.15
***************
*** 35,42 ****
// This is the MSW version of SHUT_RDWR for ::shutdown(sock, how=SHUT_RDWR)
! #ifndef SD_RECEIVE
#define SD_RECEIVE SHUT_RD
#define SD_SEND SHUT_WR
#define SD_BOTH SHUT_RDWR
#endif // SD_RECEIVE
--- 35,48 ----
// This is the MSW version of SHUT_RDWR for ::shutdown(sock, how=SHUT_RDWR)
! // Note that these are defined in winsock2.h, but if you try to include it
! // you get errors about redefinitions since it include winsock.h anyway
! #if !defined(SD_RECEIVE) && defined(SHUT_RD)
#define SD_RECEIVE SHUT_RD
#define SD_SEND SHUT_WR
#define SD_BOTH SHUT_RDWR
+ #else if !defined(SD_RECEIVE)
+ #define SD_RECEIVE 0
+ #define SD_SEND 1
+ #define SD_BOTH 2
#endif // SD_RECEIVE
***************
*** 82,85 ****
--- 88,94 ----
wxString m_name; // a readable name for the socket, for debugging
+
+ private:
+ DECLARE_ABSTRACT_CLASS(wxLuaSocketBase);
};
***************
*** 149,153 ****
{
return ((m_sockstate == SOCKET_CONNECTED) ||
! (m_sockstate == SOCKET_ACCEPTING));
}
--- 158,162 ----
{
return ((m_sockstate == SOCKET_CONNECTED) ||
! (m_sockstate == SOCKET_ACCEPTED));
}
***************
*** 181,184 ****
--- 190,195 ----
sockaddr_in m_sockaddress;
SocketState m_sockstate;
+
+ DECLARE_ABSTRACT_CLASS(wxLuaSocket);
};
***************
*** 214,220 ****
SocketErrorCode GetCode() const { return m_code; }
-
int errnum() const { return m_errnum; }
! const wxString& description() const { return m_description; }
private:
--- 225,230 ----
SocketErrorCode GetCode() const { return m_code; }
int errnum() const { return m_errnum; }
! wxString description() const { return m_description; }
private:
|
