diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-20 10:20:14 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-20 10:20:14 +0930 |
| commit | 99d28c3ef37aeffe7d8ec41e45a650ba248c6958 (patch) | |
| tree | f64efb86b1bc5f0c864d6a4ad0d79291f96b1c15 /dix/dispatch.c | |
| parent | fc7e2566cc076c0d979f74871bc436df43401058 (diff) | |
| parent | 0178b6a4abed0df3e90ba393709ed566105e7c2c (diff) | |
Merge branch 'master' into mpx
Conflicts:
Xext/xprint.c (removed in master)
config/hal.c
dix/main.c
hw/kdrive/ati/ati_cursor.c (removed in master)
hw/kdrive/i810/i810_cursor.c (removed in master)
hw/xprint/ddxInit.c (removed in master)
xkb/ddxLoad.c
Diffstat (limited to 'dix/dispatch.c')
| -rw-r--r-- | dix/dispatch.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/dix/dispatch.c b/dix/dispatch.c index 64955d952..8b2169076 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -399,9 +399,6 @@ Dispatch(void) } isItTimeToYield = FALSE; -#ifdef XPRINT - requestingClient = client; -#endif #ifdef SMART_SCHEDULE start_tick = SmartScheduleTime; #endif @@ -473,9 +470,6 @@ Dispatch(void) if (client) client->smart_stop_tick = SmartScheduleTime; #endif -#ifdef XPRINT - requestingClient = NULL; -#endif } dispatchException &= ~DE_PRIORITYCHANGE; } |