[xorg-commit-diffs] xc/programs/Xserver/dix dispatch.c, 1.1.4.4.2.3.6.1, 1.1.4.4.2.3.6.2 main.c, 1.1.4.5.2.4, 1.1.4.5.2.4.6.1

[Roland Mainz]

Committed by: gisburn

Update of /cvs/xorg/xc/programs/Xserver/dix
In directory pdx:/tmp/cvs-serv1812/xc/programs/Xserver/dix

Modified Files:
      Tag: XPRINT
	dispatch.c main.c 
Log Message:
Fix for http://xprint.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=491 - RFE: Need workaround for bug 467 ("Xfree86 smart scheduler breaks Xprt")

Index: dispatch.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/dix/dispatch.c,v
retrieving revision 1.1.4.4.2.3.6.1
retrieving revision 1.1.4.4.2.3.6.2
diff -u -d -r1.1.4.4.2.3.6.1 -r1.1.4.4.2.3.6.2
--- a/dispatch.c	17 Apr 2004 02:34:47 -0000	1.1.4.4.2.3.6.1
+++ b/dispatch.c	20 Apr 2004 03:27:08 -0000	1.1.4.4.2.3.6.2
@@ -253,14 +253,7 @@
 #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;

Index: main.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/dix/main.c,v
retrieving revision 1.1.4.5.2.4
retrieving revision 1.1.4.5.2.4.6.1
diff -u -d -r1.1.4.5.2.4 -r1.1.4.5.2.4.6.1
--- a/main.c	8 Mar 2004 00:36:56 -0000	1.1.4.5.2.4
+++ b/main.c	20 Apr 2004 03:27:08 -0000	1.1.4.5.2.4.6.1
@@ -251,6 +251,8 @@
 
     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. */