diff options
| author | shennetsind <notind@gmail.com> | 2013-06-08 12:46:37 -0700 |
|---|---|---|
| committer | shennetsind <notind@gmail.com> | 2013-06-08 12:46:37 -0700 |
| commit | 9fdea24a67a39e86c2ae4dd032f08021b35942dc (patch) | |
| tree | feea3cd428cee18be3da9bf0bee6d4570d9cad02 /src/common/mutex.c | |
| parent | b0f866ca419d87fcb3625b45e2437e0a0bb1810e (diff) | |
| parent | d73783f22b2bb881aab74524d153d89a5932a199 (diff) | |
| download | hercules-9fdea24a67a39e86c2ae4dd032f08021b35942dc.tar.gz hercules-9fdea24a67a39e86c2ae4dd032f08021b35942dc.tar.bz2 hercules-9fdea24a67a39e86c2ae4dd032f08021b35942dc.tar.xz hercules-9fdea24a67a39e86c2ae4dd032f08021b35942dc.zip | |
Merge pull request #4 from Earisu/master
Attempt to Merge Earisu's 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; |