diff options
| author | Deron Johnson <deron.johnson@sun.com> | 2005-02-17 22:44:42 +0000 |
|---|---|---|
| committer | Deron Johnson <deron.johnson@sun.com> | 2005-02-17 22:44:42 +0000 |
| commit | b70b6bd91e508602825f6a94f4748cef75a4462c (patch) | |
| tree | ed317b0c2216638fb8cbb25b51b1f5d7bf9e95b3 /dix/dispatch.c | |
| parent | 57c954d3aa00c4882c7fecfd53e772f9641c0b38 (diff) | |
Joined with branch XORG-6_8_2.
Diffstat (limited to 'dix/dispatch.c')
| -rw-r--r-- | dix/dispatch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dix/dispatch.c b/dix/dispatch.c index 14b3df38a..2d6fb6504 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/dispatch.c,v 1.5.14.2 2005/01/16 00:09:53 deronj Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/dispatch.c,v 1.5.4.1 2005/01/20 23:47:25 deronj Exp $ */ /* $Xorg: dispatch.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */ /************************************************************ @@ -494,7 +494,7 @@ Dispatch(void) register int nready; register HWEventQueuePtr* icheck = checkForInput; #ifdef SMART_SCHEDULE - int start_tick; + long start_tick; #endif nextFreeClientID = 1; |