more MS-DOS stuff in generic wxFileDialog

[wxWidgets.git] / src / unix / threadpsx.cpp

diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp
index 8207ca3576072ac0ac206f8a7575ed279aefcc6b..14edbfc078eda8438069adf7cae8ceca650bd00b 100644 (file)
--- a/src/unix/threadpsx.cpp
+++ b/src/unix/threadpsx.cpp
@@ -743,8 +743,12 @@ void wxThreadInternal::Wait()
         wxMutexGuiLeave();
 
     bool isDetached = m_isDetached;
         wxMutexGuiLeave();
 
     bool isDetached = m_isDetached;

-    long id = (long)GetId();
-    wxLogTrace(TRACE_THREADS, _T("Starting to wait for thread %ld to exit."),
+#ifdef __VMS
+   long long id = (long long)GetId();
+#else
+   long id = (long)GetId();
+#endif
+   wxLogTrace(TRACE_THREADS, _T("Starting to wait for thread %ld to exit."),

                id);
 
     // wait until the thread terminates (we're blocking in _another_ thread,
                id);
 
     // wait until the thread terminates (we're blocking in _another_ thread,


@@ -865,7 +869,7 @@ void wxThread::Sleep(unsigned long milliseconds)
 
 int wxThread::GetCPUCount()
 {
 
 int wxThread::GetCPUCount()
 {

-#if defined(__LINUX__)
+#if defined(__LINUX__) && wxUSE_FFILE

     // read from proc (can't use wxTextFile here because it's a special file:
     // it has 0 size but still can be read from)
     wxLogNull nolog;
     // read from proc (can't use wxTextFile here because it's a special file:
     // it has 0 size but still can be read from)
     wxLogNull nolog;


@@ -934,7 +938,7 @@ wxThread::wxThread(wxThreadKind kind)
     m_isDetached = kind == wxTHREAD_DETACHED;
 }
 
     m_isDetached = kind == wxTHREAD_DETACHED;
 }
 

-wxThreadError wxThread::Create()
+wxThreadError wxThread::Create(unsigned int WXUNUSED(stackSize))

 {
     if ( m_internal->GetState() != STATE_NEW )
     {
 {
     if ( m_internal->GetState() != STATE_NEW )
     {


@@ -1105,9 +1109,15 @@ unsigned int wxThread::GetPriority() const
     return m_internal->GetPriority();
 }
 
     return m_internal->GetPriority();
 }
 

+#ifdef __VMS
+unsigned long long wxThread::GetId() const
+{
+    return (unsigned long long)m_internal->GetId();
+#else

 unsigned long wxThread::GetId() const
 {
     return (unsigned long)m_internal->GetId();
 unsigned long wxThread::GetId() const
 {
     return (unsigned long)m_internal->GetId();

+#endif

 }
 
 // -----------------------------------------------------------------------------
 }
 
 // -----------------------------------------------------------------------------