summaryrefslogtreecommitdiff
path: root/Xext/saver.c
diff options
context:
space:
mode:
authorFredrik Höglund <fredrik@kde.org>2006-04-05 21:08:45 +0000
committerFredrik Höglund <fredrik@kde.org>2006-04-05 21:08:45 +0000
commite1fc15a85fb367ee9afd63c920c3327c3f45158d (patch)
tree13aee3042dd4a3a7ab3e73b50abc659bc4497218 /Xext/saver.c
parent383c2e1e9ec54ab9de356993ad552c1aa6ec094f (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 'Xext/saver.c')
-rw-r--r--Xext/saver.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/Xext/saver.c b/Xext/saver.c
index f2c2fdf01..d873ffde6 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xserver/xorg/Xext/saver.c,v 1.11 2006/02/10 22:00:20 anholt Exp $ */
+/* $XdotOrg: xserver/xorg/Xext/saver.c,v 1.12 2006/03/31 18:49:38 fredrik Exp $ */
/*
* $XConsortium: saver.c,v 1.12 94/04/17 20:59:36 dpw Exp $
*
@@ -121,8 +121,6 @@ static void ScreenSaverResetProc (
static RESTYPE SuspendType; /* resource type for suspension records */
-_X_EXPORT Bool screenSaverSuspended = FALSE; /* used in os/WaitFor.c */
-
typedef struct _ScreenSaverSuspension *ScreenSaverSuspensionPtr;
/* List of clients that are suspending the screensaver. */