diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-07 08:26:06 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-07 08:27:25 +0100 |
| commit | c97d11aec40d8fa07d6b456bf8694133a77d35f4 (patch) | |
| tree | 9e14e6f970a86af9f7107053c5c709e2e440d032 /xorg-server/os | |
| parent | 51c3a4e7b08aa904ff2af52a9f6f7adc748b361f (diff) | |
| parent | f7050e0ff2d1dd147ff5ef45f8ff7d8d7833db48 (diff) | |
| download | vcxsrv-c97d11aec40d8fa07d6b456bf8694133a77d35f4.tar.gz vcxsrv-c97d11aec40d8fa07d6b456bf8694133a77d35f4.tar.bz2 vcxsrv-c97d11aec40d8fa07d6b456bf8694133a77d35f4.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xextproto fontconfig libxcb mesa xserver git update 7 Nov 2013
Conflicts:
xorg-server/include/servermd.h
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 202e5da06..c40a938f7 100644 --- a/xorg-server/os/utils.c +++ b/xorg-server/os/utils.c @@ -501,7 +501,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 |