X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fthreads%2FSGThread.cxx;h=c7a841b02bb9d8b0ddb3dadbf3621baca0812ca5;hb=6a7c2000027cd22eea603e936ddbad1a5bfc8b04;hp=6c5fe682fb6a281e7b54564951389be48e05819e;hpb=c8ef854f01f6be48f58fa787701f7811a4b9fbe7;p=simgear.git diff --git a/simgear/threads/SGThread.cxx b/simgear/threads/SGThread.cxx index 6c5fe682..c7a841b0 100644 --- a/simgear/threads/SGThread.cxx +++ b/simgear/threads/SGThread.cxx @@ -3,8 +3,16 @@ #if defined(_MSC_VER) || defined(__MINGW32__) # include #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 +# endif # include #endif +#if _MSC_VER >= 1300 +# include +#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 );