forgot wx.rc

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

diff --git a/include/wx/sckint.h b/include/wx/sckint.h
index 0a3ca5b5e576d1432085b790693ec92f90ea839c..103595f5f6a7d30b3ce755838452394b6de25408 100644 (file)
--- a/include/wx/sckint.h
+++ b/include/wx/sckint.h
@@ -15,12 +15,14 @@
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

+#include "wx/defs.h"
+

 #if wxUSE_SOCKETS
 
 #if wxUSE_SOCKETS
 

-#include <wx/object.h>
-#include <wx/list.h>
-#include <wx/socket.h>
-#include <wx/thread.h>
+#include "wx/object.h"
+#include "wx/list.h"
+#include "wx/socket.h"
+#include "wx/thread.h"

 
 // Socket state
 class SocketState
 
 // Socket state
 class SocketState


@@ -81,8 +83,13 @@ class SocketWaiter: public wxThread {
   wxSocketInternal *m_internal;
   int m_fd;
 };
   wxSocketInternal *m_internal;
   int m_fd;
 };

+#endif

 
 

-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();


@@ -93,17 +100,17 @@ class SocketRequester: public wxThread {
 
   bool WaitFor(wxSocketBase::wxRequestNotify req, int millisec);
 
 
   bool WaitFor(wxSocketBase::wxRequestNotify req, int millisec);
 

+#if wxUSE_THREADS

   // Thread Entry point
   // ---
   virtual void *Entry();
   // Thread Entry point
   // ---
   virtual void *Entry();

+#endif

 
  public:
   wxSocketBase *m_socket;
   wxSocketInternal *m_internal;
   int m_fd;
 };
 
  public:
   wxSocketBase *m_socket;
   wxSocketInternal *m_internal;
   int m_fd;
 };

-#endif
-  // wxUSE_THREADS

 
 class wxSocketInternal {
  public:
 
 class wxSocketInternal {
  public:


@@ -128,6 +135,7 @@ class wxSocketInternal {
   void QueueRequest(SockRequest *request, bool async);
   void WaitForEnd(SockRequest *request);
 
   void QueueRequest(SockRequest *request, bool async);
   void WaitForEnd(SockRequest *request);
 

+  // Used by SocketRequester

   SockRequest *WaitForReq();
   void EndRequest(SockRequest *req);
  public:
   SockRequest *WaitForReq();
   void EndRequest(SockRequest *req);
  public:


@@ -136,8 +144,8 @@ class wxSocketInternal {
   wxMutex m_socket_locker, m_fd_locker, m_request_locker, m_end_requester;
   wxCondition m_socket_cond;
   SocketWaiter *m_thread_waiter;
   wxMutex m_socket_locker, m_fd_locker, m_request_locker, m_end_requester;
   wxCondition m_socket_cond;
   SocketWaiter *m_thread_waiter;

-  SocketRequester *m_thread_requester;

 #endif
 #endif

+  SocketRequester *m_thread_requester;

   wxList m_requests;
   int m_fd;
   bool m_invalid_requester;
   wxList m_requests;
   int m_fd;
   bool m_invalid_requester;