Better memory errors handler (added GSOCK_MEMERR)

Fixed 'NULL' warning in socket.cpp


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guilhem Lavaux
1999-08-02 17:46:43 +00:00
parent 1408104d04
commit e00f35bb06
4 changed files with 93 additions and 26 deletions

View File

@@ -131,7 +131,7 @@ bool wxSocketBase::Close()
class _wxSocketInternalTimer: public wxTimer {
public:
int *m_state;
int m_new_val;
unsigned long m_new_val;
void Notify()
{
@@ -165,7 +165,7 @@ int wxSocketBase::DeferRead(char *buffer, size_t nbytes)
m_defer_timer = &timer;
timer.m_state = (int *)&m_defer_buffer;
timer.m_new_val = (int)NULL;
timer.m_new_val = 0;
timer.Start(m_timeout * 1000, FALSE);
@@ -322,7 +322,7 @@ int wxSocketBase::DeferWrite(const char *buffer, size_t nbytes)
// Start timer
timer.m_state = (int *)&m_defer_buffer;
timer.m_new_val = (int)NULL;
timer.m_new_val = 0;
m_defer_timer = &timer;
timer.Start(m_timeout * 1000, FALSE);