remove CopyPolicy from ModelRegistry

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

diff --git a/simgear/threads/SGThread.cxx b/simgear/threads/SGThread.cxx
index 484cce1d055a83741813a96bcb5bd0451eb33f5c..c7a841b02bb9d8b0ddb3dadbf3621baca0812ca5 100644 (file)
--- a/simgear/threads/SGThread.cxx
+++ b/simgear/threads/SGThread.cxx
@@ -3,10 +3,15 @@
 #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"
+#  include <winsock2.h>
 #endif
 
 #include "SGThread.hxx"