remove CopyPolicy from ModelRegistry

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

diff --git a/simgear/threads/SGThread.cxx b/simgear/threads/SGThread.cxx
index c6d016a0fece9ddac942a585459459c50fe01376..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"