Added missing file.

[wxWidgets.git] / include / wx / sckint.h

diff --git a/include/wx/sckint.h b/include/wx/sckint.h
index e42b7bfb9ed889fb0a4e42b4a23eb1eda89ea5f5..3fec426a7a1efe1c5e57dde1174da75128f461d5 100644 (file)
--- a/include/wx/sckint.h
+++ b/include/wx/sckint.h
@@ -61,6 +61,8 @@ class SockRequest
 };
 
 class wxSocketInternal;
 };
 
 class wxSocketInternal;

+
+#if wxUSE_THREADS

 class SocketWaiter: public wxThread {
  public:
   SocketWaiter(wxSocketBase *socket, wxSocketInternal *internal);
 class SocketWaiter: public wxThread {
  public:
   SocketWaiter(wxSocketBase *socket, wxSocketInternal *internal);


@@ -80,7 +82,11 @@ class SocketWaiter: public wxThread {
   int m_fd;
 };
 
   int m_fd;
 };
 

-class SocketRequester: public wxThread {
+class SocketRequester
+#if wxUSE_THREADS
+  : public wxThread 
+#endif
+         {

  public:
   SocketRequester(wxSocketBase *socket, wxSocketInternal *internal);
   ~SocketRequester();
  public:
   SocketRequester(wxSocketBase *socket, wxSocketInternal *internal);
   ~SocketRequester();


@@ -100,6 +106,8 @@ class SocketRequester: public wxThread {
   wxSocketInternal *m_internal;
   int m_fd;
 };
   wxSocketInternal *m_internal;
   int m_fd;
 };

+#endif
+  // wxUSE_THREADS

 
 class wxSocketInternal {
  public:
 
 class wxSocketInternal {
  public:


@@ -114,6 +122,7 @@ class wxSocketInternal {
   void ReleaseFD();
 
   int GetFD() { return m_fd; }
   void ReleaseFD();
 
   int GetFD() { return m_fd; }

+  void SetFD(int fd) { m_fd = fd; }

   
   void ResumeWaiter();
   void StopWaiter();
   
   void ResumeWaiter();
   void StopWaiter();


@@ -126,13 +135,16 @@ class wxSocketInternal {
   SockRequest *WaitForReq();
   void EndRequest(SockRequest *req);
  public:
   SockRequest *WaitForReq();
   void EndRequest(SockRequest *req);
  public:

-  wxMutex m_socket_locker, m_fd_locker, m_request_locker;
-  wxCondition m_socket_cond;

   wxSocketBase *m_socket;
   wxSocketBase *m_socket;

+#if wxUSE_THREADS
+  wxMutex m_socket_locker, m_fd_locker, m_request_locker, m_end_requester;
+  wxCondition m_socket_cond;

   SocketWaiter *m_thread_waiter;
   SocketWaiter *m_thread_waiter;

+#endif

   SocketRequester *m_thread_requester;
   wxList m_requests;
   int m_fd;
   SocketRequester *m_thread_requester;
   wxList m_requests;
   int m_fd;

+  bool m_invalid_requester;

 };
 
 #endif
 };
 
 #endif