[Wxlua-commit] wxLua/modules/wxluasocket/include wxldserv.h, 1.30, 1.31

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1533/wxLua/modules/wxluasocket/include

Modified Files:
	wxldserv.h 
Log Message:
Fix server to work in MSW for the wxLua IDE


Index: wxldserv.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldserv.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** wxldserv.h	19 May 2007 02:05:47 -0000	1.30
--- wxldserv.h	19 May 2007 17:14:13 -0000	1.31
***************
*** 246,250 ****
      static wxString GetNetworkName() { return sm_networkName; }
  
! protected:
      int                   m_port_number;       // the socket port to listen to
      wxLuaStackDialog     *m_stackDialog;       // the stack dialog to
--- 246,251 ----
      static wxString GetNetworkName() { return sm_networkName; }
  
!     // implementation
! 
      int                   m_port_number;       // the socket port to listen to
      wxLuaStackDialog     *m_stackDialog;       // the stack dialog to
***************
*** 252,255 ****
--- 253,259 ----
      long                  m_debuggeeProcessID; // id of the debuggee wxProcess
  
+     wxCriticalSection     m_acceptSockCritSect; // for deleting accepted socket
+     wxCriticalSection     m_processCritSect;    // for deleting the client process
+ 
      static wxString sm_programName; // name of the program to run for debuggee
      static wxString sm_networkName; // name of the network to use for the debuggee
***************
*** 281,285 ****
              LuaThread(wxLuaDebuggerCServer *pServer) : wxThread(wxTHREAD_JOINABLE),
                                                         m_pServer(pServer) {}
!         protected:
              virtual void *Entry();   // thread execution starts here
              virtual void OnExit();   // called when the thread exits
--- 285,289 ----
              LuaThread(wxLuaDebuggerCServer *pServer) : wxThread(wxTHREAD_JOINABLE),
                                                         m_pServer(pServer) {}
! 
              virtual void *Entry();   // thread execution starts here
              virtual void OnExit();   // called when the thread exits
***************
*** 311,315 ****
      void ThreadFunction();
  
- protected:
      bool WaitForConnect(int timeOut);
  
--- 315,318 ----