From 38576dc3ae8ddec2baedd2f7e64abdfc56bedf93 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 3 Apr 2009 11:55:41 -0400
Subject: [PATCH] DPMS: Simplify some macro silliness.

---
 dix/globals.c | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/dix/globals.c b/dix/globals.c
index 258579889..805621a2c 100644
--- a/dix/globals.c
+++ b/dix/globals.c
@@ -95,25 +95,13 @@ int ScreenSaverBlanking;
 int  ScreenSaverAllowExposures;
 
 #ifdef DPMSExtension
-# ifndef DEFAULT_STANDBY_TIME
-#  define DEFAULT_STANDBY_TIME DEFAULT_SCREEN_SAVER_TIME * 2
-# endif
-# ifndef DEFAULT_SUSPEND_TIME
-#  define DEFAULT_SUSPEND_TIME DEFAULT_SCREEN_SAVER_TIME * 3
-# endif
-# ifndef DEFAULT_OFF_TIME
-#  define DEFAULT_OFF_TIME DEFAULT_SCREEN_SAVER_TIME * 4
-# endif
-# ifndef DEFAULT_DPMS_ENABLED
-#  define DEFAULT_DPMS_ENABLED TRUE
-# endif
-CARD32 defaultDPMSStandbyTime = DEFAULT_STANDBY_TIME;
-CARD32 defaultDPMSSuspendTime = DEFAULT_SUSPEND_TIME;
-CARD32 defaultDPMSOffTime = DEFAULT_OFF_TIME;
+CARD32 defaultDPMSStandbyTime = DEFAULT_SCREEN_SAVER_TIME * 2;
+CARD32 defaultDPMSSuspendTime = DEFAULT_SCREEN_SAVER_TIME * 3;
+CARD32 defaultDPMSOffTime = DEFAULT_SCREEN_SAVER_TIME * 4;
 CARD16 DPMSPowerLevel = 0;
-Bool defaultDPMSEnabled = DEFAULT_DPMS_ENABLED;
+Bool defaultDPMSEnabled = TRUE;
 Bool DPMSEnabledSwitch = FALSE;  /* these denote the DPMS command */
-Bool DPMSDisabledSwitch = FALSE; /* lind switch states */
+Bool DPMSDisabledSwitch = FALSE; /* line switch states */
 Bool DPMSCapableFlag = FALSE;
 CARD32 DPMSStandbyTime;
 CARD32 DPMSSuspendTime;