diff options
| author | Thomas Grill <xovo@users.sourceforge.net> | 2004-12-18 05:01:11 +0000 |
|---|---|---|
| committer | Thomas Grill <xovo@users.sourceforge.net> | 2004-12-18 05:01:11 +0000 |
| commit | e741586389de21efe0dd7fa1b0057c970e4c1a17 (patch) | |
| tree | a6307013f3366f626a0a2893474e3ba67a7f8614 /externals/grill/flext/source | |
| parent | 4deb2e053f989ba20a9864c6171af844141f7f80 (diff) | |
updated build system for linux
updated make system for BCC
build system for flext-based externals
updated build system
add xcode project
comply to build system
svn path=/trunk/; revision=2405
Diffstat (limited to 'externals/grill/flext/source')
| -rw-r--r-- | externals/grill/flext/source/flthr.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/externals/grill/flext/source/flthr.cpp b/externals/grill/flext/source/flthr.cpp index 8a7a841f..fe70dfdd 100644 --- a/externals/grill/flext/source/flthr.cpp +++ b/externals/grill/flext/source/flthr.cpp @@ -604,12 +604,17 @@ bool flext::ThrCond::Wait() { return ret; } -bool flext::ThrCond::TimedWait(double ftime) +bool flext::ThrCond::TimedWait(double ftm) { timespec tm; #if FLEXT_OS == FLEXT_OS_WIN && FLEXT_OSAPI == FLEXT_OSAPI_WIN_NATIVE +#ifdef _MSC_VER _timeb tmb; _ftime(&tmb); +#else + timeb tmb; + ftime(&tmb); +#endif tm.tv_nsec = tmb.millitm*1000000; tm.tv_sec = tmb.time; #else // POSIX @@ -623,9 +628,9 @@ bool flext::ThrCond::TimedWait(double ftime) #endif #endif - tm.tv_nsec += (long)((ftime-(long)ftime)*1.e9); + tm.tv_nsec += (long)((ftm-(long)ftm)*1.e9); long nns = tm.tv_nsec%1000000000; - tm.tv_sec += (long)ftime+(tm.tv_nsec-nns)/1000000000; + tm.tv_sec += (long)ftm+(tm.tv_nsec-nns)/1000000000; tm.tv_nsec = nns; Lock(); |