diff options
| author | Roland Mainz <roland.mainz@nrubsig.org> | 2004-04-20 03:27:09 +0000 |
|---|---|---|
| committer | Roland Mainz <roland.mainz@nrubsig.org> | 2004-04-20 03:27:09 +0000 |
| commit | 102cb14a5d91bf074bed4c261d02434a32bf17dd (patch) | |
| tree | 6f2faa0bdc0ba67900af7dac4f7aef1052e06f61 /dix | |
| parent | 0d0097350fbbe12b434f625004f2fe9ed4091ee7 (diff) | |
| download | xserver-XPRINT.tar.gz | |
Fix for http://xprint.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=491XPRINT
- RFE: Need workaround for bug 467 ("Xfree86 smart scheduler breaks
Xprt")
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/dispatch.c | 9 | ||||
| -rw-r--r-- | dix/main.c | 4 |
2 files changed, 4 insertions, 9 deletions
diff --git a/dix/dispatch.c b/dix/dispatch.c index fc8715c03..96d636d35 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/dispatch.c,v 1.1.4.4.2.3 2004/03/08 00:36:56 alanc Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/dispatch.c,v 1.1.4.4.2.3.6.1 2004/04/17 02:34:47 gisburn Exp $ */ /* $Xorg: dispatch.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */ /************************************************************ @@ -253,14 +253,7 @@ FlushClientCaches(id) #define SMART_SCHEDULE_DEFAULT_INTERVAL 20 /* ms */ #define SMART_SCHEDULE_MAX_SLICE 200 /* ms */ -#ifdef XPRINT -/* Somehow the XF86 "smart scheduler" completely kills the Xprint DDX - * (see http://xprint.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=467 - * ("Xfree86's "smart scheduler" breaks Xprt") */ -Bool SmartScheduleDisable = TRUE; -#else Bool SmartScheduleDisable = FALSE; -#endif /* XPRINT */ long SmartScheduleSlice = SMART_SCHEDULE_DEFAULT_INTERVAL; long SmartScheduleInterval = SMART_SCHEDULE_DEFAULT_INTERVAL; long SmartScheduleMaxSlice = SMART_SCHEDULE_MAX_SLICE; diff --git a/dix/main.c b/dix/main.c index b7aba1d8c..c327efec5 100644 --- a/dix/main.c +++ b/dix/main.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/main.c,v 1.1.4.5.2.3 2004/03/04 20:16:04 kaleb Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/main.c,v 1.1.4.5.2.4 2004/03/08 00:36:56 alanc Exp $ */ /* $XFree86: xc/programs/Xserver/dix/main.c,v 3.43 2003/10/30 21:21:02 herrb Exp $ */ /*********************************************************** @@ -251,6 +251,8 @@ main(int argc, char *argv[], char *envp[]) display = "0"; + InitGlobals(); + /* Quartz support on Mac OS X requires that the Cocoa event loop be in * the main thread. This allows the X server main to be called again * from another thread. */ |