Put the screensaver extension back in the Xext module.

Move the screenSaverSuspended variable to DIX globals.
Restore the old link order for the Xorg and Xdmx binaries.
This commit is contained in:
Fredrik Höglund 2006-04-05 21:08:45 +00:00
commit e1fc15a85f
7 changed files with 28 additions and 18 deletions

View file

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/include/globals.h,v 1.6 2005/05/19 18:53:49 ajax Exp $ */
/* $XdotOrg: xserver/xorg/include/globals.h,v 1.10 2006/01/08 23:43:54 ajax Exp $ */
/* $XFree86: xc/programs/Xserver/include/globals.h,v 1.3 1999/09/25 14:38:21 dawes Exp $ */
#ifndef _XSERV_GLOBAL_H_
@ -13,6 +13,10 @@ extern CARD32 defaultScreenSaverInterval;
extern CARD32 ScreenSaverTime;
extern CARD32 ScreenSaverInterval;
#ifdef SCREENSAVER
extern Bool screenSaverSuspended;
#endif
extern char *defaultFontPath;
extern char *rgbPath;
extern int monitorResolution;