diff options
author | Fredrik Höglund <fredrik@kde.org> | 2006-04-05 21:08:45 +0000 |
---|---|---|
committer | Fredrik Höglund <fredrik@kde.org> | 2006-04-05 21:08:45 +0000 |
commit | e1fc15a85fb367ee9afd63c920c3327c3f45158d (patch) | |
tree | 13aee3042dd4a3a7ab3e73b50abc659bc4497218 /include | |
parent | 383c2e1e9ec54ab9de356993ad552c1aa6ec094f (diff) |
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.
Diffstat (limited to 'include')
-rw-r--r-- | include/globals.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/globals.h b/include/globals.h index 911d0c0b7..a661d8b63 100644 --- a/include/globals.h +++ b/include/globals.h @@ -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; |