diff options
| author | Matias <matiassw@gmail.com> | 2013-06-25 16:59:44 -0400 |
|---|---|---|
| committer | Matias <matiassw@gmail.com> | 2013-06-25 16:59:44 -0400 |
| commit | b40371d3a0772031d12f2782c10976413c6f34b9 (patch) | |
| tree | 7aeed5544a9df524a834cc739d3f596b66d6a006 /src/common/mutex.c | |
| parent | 25914bae30eced388cf8640eead19fbb11a65ade (diff) | |
| parent | 5785dbae3f513da20611e3147dadef2b9c911443 (diff) | |
| download | hercules-b40371d3a0772031d12f2782c10976413c6f34b9.tar.gz hercules-b40371d3a0772031d12f2782c10976413c6f34b9.tar.bz2 hercules-b40371d3a0772031d12f2782c10976413c6f34b9.tar.xz hercules-b40371d3a0772031d12f2782c10976413c6f34b9.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/common/mutex.c')
| -rw-r--r-- | src/common/mutex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/mutex.c b/src/common/mutex.c index 6b4f55119..6bb1efdab 100644 --- a/src/common/mutex.c +++ b/src/common/mutex.c @@ -201,7 +201,7 @@ void racond_wait( racond c, ramutex m, sysint timeout_ticks){ pthread_cond_wait( &c->hCond, &m->hMutex ); }else{ struct timespec wtime; - int64 exact_timeout = gettick() + timeout_ticks; + int64 exact_timeout = iTimer->gettick() + timeout_ticks; wtime.tv_sec = exact_timeout/1000; wtime.tv_nsec = (exact_timeout%1000)*1000000; |