cygwin and mingw fixes

[simgear.git] / simgear / threads / SGThread.hxx

diff --git a/simgear/threads/SGThread.hxx b/simgear/threads/SGThread.hxx
index e2fbcdfbbc60b88e6986a3ab0d0a3d68ac65feeb..fd7d4e660fbaac5c50cd419a590e9700e2b066bc 100644 (file)
--- a/simgear/threads/SGThread.hxx
+++ b/simgear/threads/SGThread.hxx
@@ -23,9 +23,16 @@
 #ifndef SGTHREAD_HXX_INCLUDED
 #define SGTHREAD_HXX_INCLUDED 1
 
+#include <simgear/compiler.h>
+
 #include <pthread.h>
-#include <cassert>
-#include <cerrno>
+#if defined ( SG_HAVE_STD_INCLUDES )
+#  include <cassert>
+#  include <cerrno>
+#else
+#  include <assert.h>
+#  include <sys/errno.h>
+#endif
 
 class SGThread;
 
@@ -47,7 +54,7 @@ public:
     {
        CANCEL_DISABLE = 0,
        CANCEL_DEFERRED,
-       CANCEL_IMMEDIATE,
+       CANCEL_IMMEDIATE
     };
 public:
 
@@ -150,7 +157,7 @@ SGThread::cancel()
  */
 class SGMutex
 {
-    friend class SGCondition;
+    friend class SGPthreadCond;
 
 public:
 
@@ -232,18 +239,18 @@ inline void SGMutex::unlock()
  * A condition variable is always associated with a mutex to avoid race
  * conditions. 
  */
-class SGCondition
+class SGPthreadCond
 {
 public:
     /**
      * Create a new condition variable.
      */
-    SGCondition();
+    SGPthreadCond();
 
     /**
      * Destroy the condition object.
      */
-    ~SGCondition();
+    ~SGPthreadCond();
 
     /**
      * Wait for this condition variable to be signaled.
@@ -279,8 +286,8 @@ public:
 
 private:
     // Disable copying.
-    SGCondition(const SGCondition& );
-    SGCondition& operator=(const SGCondition& );
+    SGPthreadCond(const SGPthreadCond& );
+    SGPthreadCond& operator=(const SGPthreadCond& );
 
 private:
 
@@ -290,31 +297,31 @@ private:
     pthread_cond_t cond;
 };
 
-inline SGCondition::SGCondition()
+inline SGPthreadCond::SGPthreadCond()
 {
     int status = pthread_cond_init( &cond, 0 );
     assert( status == 0 );
 }
 
-inline SGCondition::~SGCondition()
+inline SGPthreadCond::~SGPthreadCond()
 {
     int status = pthread_cond_destroy( &cond );
     assert( status == 0 );
 }
 
-inline void SGCondition::signal()
+inline void SGPthreadCond::signal()
 {
     int status = pthread_cond_signal( &cond );
     assert( status == 0 );
 }
 
-inline void SGCondition::broadcast()
+inline void SGPthreadCond::broadcast()
 {
     int status = pthread_cond_broadcast( &cond );
     assert( status == 0 );
 }
 
-inline void SGCondition::wait( SGMutex& mutex )
+inline void SGPthreadCond::wait( SGMutex& mutex )
 {
     int status = pthread_cond_wait( &cond, &mutex.mutex );
     assert( status == 0 );