[xorg-commit-diffs] xc/programs/Xserver/dix dispatch.c, 1.1.4.9, 1.1.4.10 main.c, 1.1.4.8, 1.1.4.9

[Roland Mainz]

Committed by: gisburn

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

Modified Files:
      Tag: XORG-CURRENT
	dispatch.c main.c 
Log Message:
Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=530 - Land XPRINT branch on XORG-CURRENT

Index: dispatch.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/dix/dispatch.c,v
retrieving revision 1.1.4.9
retrieving revision 1.1.4.10
diff -u -d -r1.1.4.9 -r1.1.4.10
--- a/dispatch.c	15 Apr 2004 10:15:46 -0000	1.1.4.9
+++ b/dispatch.c	21 Apr 2004 10:03:39 -0000	1.1.4.10
@@ -253,7 +253,7 @@
 #define SMART_SCHEDULE_DEFAULT_INTERVAL	20	    /* ms */
 #define SMART_SCHEDULE_MAX_SLICE	200	    /* ms */
 
-Bool	    SmartScheduleDisable;
+Bool	    SmartScheduleDisable = FALSE;
 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.8
retrieving revision 1.1.4.9
diff -u -d -r1.1.4.8 -r1.1.4.9
--- a/main.c	15 Apr 2004 10:15:46 -0000	1.1.4.8
+++ b/main.c	21 Apr 2004 10:03:39 -0000	1.1.4.9
@@ -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. */