diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-07 08:21:08 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-07 08:21:08 +0100 |
| commit | f7050e0ff2d1dd147ff5ef45f8ff7d8d7833db48 (patch) | |
| tree | b730b2594caa70dcbbf0a860da25d46d26f747ed /xorg-server/os | |
| parent | 31fd4c5654595a4763e492e4ec26f66ca3a8a405 (diff) | |
| download | vcxsrv-f7050e0ff2d1dd147ff5ef45f8ff7d8d7833db48.tar.gz vcxsrv-f7050e0ff2d1dd147ff5ef45f8ff7d8d7833db48.tar.bz2 vcxsrv-f7050e0ff2d1dd147ff5ef45f8ff7d8d7833db48.zip | |
xextproto fontconfig libxcb mesa xserver git update 7 Nov 2013
xserver commit ab4b1fb38a61feb73d8336cc7a3399eb9d3d25be
libxcb commit e4e0c6eec861f4c69da12060dc8dbe7a63fa5eb6
libxcb/xcb-proto commit 530817c5a926f006d8d61f9dcfd9ab73269a9805
xextproto commit 3f355f138d6df57e067458a20f47307883048adb
fontconfig commit a4443e64c89256087d40462cfbb482950873e366
mesa commit 110009302bddb4c42a5b3ed5ca451d6bb50a06a0
Diffstat (limited to 'xorg-server/os')
| -rw-r--r-- | xorg-server/os/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/os/utils.c b/xorg-server/os/utils.c index 995f62a37..fb20da755 100644 --- a/xorg-server/os/utils.c +++ b/xorg-server/os/utils.c @@ -480,7 +480,7 @@ GetTimeInMicros(void) else clockid = ~0L; } - if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0) + if (clockid != ~0L && clock_gettime(clockid, &tp) == 0) return (CARD64) tp.tv_sec * (CARD64)1000000 + tp.tv_nsec / 1000; #endif |