[Wxlua-commit] wxLua/modules/wxluasocket/include wxldserv.h, 1.16, 1.17 wxldtarg.h, 1.17, 1.18 wxlsock.h, 1.15, 1.16

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

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

Modified Files:
	wxldserv.h wxldtarg.h wxlsock.h 
Log Message:
more cleanup, fix wrong #elif statement


Index: wxldserv.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldserv.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** wxldserv.h	29 Sep 2006 20:47:15 -0000	1.16
--- wxldserv.h	29 Sep 2006 22:22:06 -0000	1.17
***************
*** 96,100 ****
  
  // ----------------------------------------------------------------------------
! // wxLuaDebuggerBase - Debugger interface base class
  //
  // ----------------------------------------------------------------------------
--- 96,100 ----
  
  // ----------------------------------------------------------------------------
! // wxLuaDebuggerBase - Socket debugger interface base class
  //
  // ----------------------------------------------------------------------------
***************
*** 109,129 ****
      // and the appropriate data to the debuggee.
  
!     virtual bool AddBreakPoint(const wxString &fileName, int lineNumber);
!     virtual bool RemoveBreakPoint(const wxString &fileName, int lineNumber);
!     virtual bool DisableBreakPoint(const wxString &fileName, int lineNumber);
!     virtual bool EnableBreakPoint(const wxString &fileName, int lineNumber);
!     virtual bool ClearAllBreakPoints();
!     virtual bool Run(const wxString &fileName, const wxString &buffer);
!     virtual bool Step();
!     virtual bool StepOver();
!     virtual bool StepOut();
!     virtual bool Continue();
!     virtual bool Break();
!     virtual bool Reset();
!     virtual bool EnumerateStack();
!     virtual bool EnumerateStackEntry(int stackEntry);
!     virtual bool EnumerateTable(int tableRef, int nIndex, long nItemNode);
!     virtual bool CleanupDebugReferences();
!     virtual bool EvaluateExpr(int exprRef, const wxString &strExpression);
  
      // compile the buffer in a temp lua_State returning true on success.
--- 109,129 ----
      // and the appropriate data to the debuggee.
  
!     bool AddBreakPoint(const wxString &fileName, int lineNumber);
!     bool RemoveBreakPoint(const wxString &fileName, int lineNumber);
!     bool DisableBreakPoint(const wxString &fileName, int lineNumber);
!     bool EnableBreakPoint(const wxString &fileName, int lineNumber);
!     bool ClearAllBreakPoints();
!     bool Run(const wxString &fileName, const wxString &buffer);
!     bool Step();
!     bool StepOver();
!     bool StepOut();
!     bool Continue();
!     bool Break();
!     bool Reset();
!     bool EnumerateStack();
!     bool EnumerateStackEntry(int stackEntry);
!     bool EnumerateTable(int tableRef, int nIndex, long nItemNode);
!     bool CleanupDebugReferences();
!     bool EvaluateExpr(int exprRef, const wxString &strExpression);
  
      // compile the buffer in a temp lua_State returning true on success.
***************
*** 131,135 ****
      bool Compile(const wxString &fileName, const wxString &buffer);
  
!     virtual int HandleDebuggeeEvent(wxLuaSocketDebuggeeEvents_Type event_type);
  
      // Get the debugger socket to read/write data to
--- 131,136 ----
      bool Compile(const wxString &fileName, const wxString &buffer);
  
!     // Handle the wxLuaSocketDebuggeeEvents_Type event sent by the debuggee
!     virtual int HandleDebuggeeEvent(int event_type);
  
      // Get the debugger socket to read/write data to

Index: wxlsock.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxlsock.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** wxlsock.h	29 Sep 2006 20:47:15 -0000	1.15
--- wxlsock.h	29 Sep 2006 22:22:06 -0000	1.16
***************
*** 36,45 ****
  // 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
--- 36,45 ----
  // 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 includes 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
! #elif !defined(SD_RECEIVE)
      #define SD_RECEIVE      0
      #define SD_SEND         1
***************
*** 64,68 ****
      virtual bool IsConnected() = 0;
  
!     // Read the number of bytes length into buffer buffer from the socket
      //  the buffer must be large enough to hold the data.
      virtual int Read(char *buffer, wxUint32 length) = 0;
--- 64,68 ----
      virtual bool IsConnected() = 0;
  
!     // Read the number of bytes length into buffer from the socket
      //  the buffer must be large enough to hold the data.
      virtual int Read(char *buffer, wxUint32 length) = 0;

Index: wxldtarg.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldtarg.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** wxldtarg.h	28 Sep 2006 22:26:05 -0000	1.17
--- wxldtarg.h	29 Sep 2006 22:22:06 -0000	1.18
***************
*** 52,57 ****
  
      void ThreadFunction();
!     int HandleDebuggerCmd(int cmd);
!     void DisplayError(const wxString &strError);
  
  protected:
--- 52,57 ----
  
      void ThreadFunction();
!     int  HandleDebuggerCmd(int cmd);
!     void DisplayError(const wxString& errorMsg) { NotifyError(errorMsg); }
  
  protected: