remove CopyPolicy from ModelRegistry

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

diff --git a/simgear/threads/SGThread.cxx b/simgear/threads/SGThread.cxx
index 6c5fe682fb6a281e7b54564951389be48e05819e..c7a841b02bb9d8b0ddb3dadbf3621baca0812ca5 100644 (file)
--- a/simgear/threads/SGThread.cxx
+++ b/simgear/threads/SGThread.cxx
@@ -3,8 +3,16 @@
 #if defined(_MSC_VER) || defined(__MINGW32__)
 #  include <time.h>
 #else
+#  if defined ( sgi ) && !defined( __GNUC__ )
+     // This works around a bug triggered when using MipsPro 7.4.1
+     // and (at least) IRIX 6.5.20
+#    include <iostream>
+#  endif
 #  include <sys/time.h>
 #endif
+#if _MSC_VER >= 1300
+#  include <winsock2.h>
+#endif
 
 #include "SGThread.hxx"
 
@@ -75,7 +83,7 @@ int gettimeofday(struct timeval* tp, void* tzp) {
 #endif
 
 bool
-SGCondition::wait( SGMutex& mutex, unsigned long ms )
+SGPthreadCond::wait( SGMutex& mutex, unsigned long ms )
 {
     struct timeval now;
     ::gettimeofday( &now, 0 );