From 3de9a10f36bae82cf0324fba98f30c0e9455b751 Mon Sep 17 00:00:00 2001
From: Deron Johnson <deron.johnson@sun.com>
Date: Thu, 17 Feb 2005 22:44:27 +0000
Subject: Joined with branch XORG-6_8_2.

---
 dpms.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/dpms.h b/dpms.h
index 4f1d70f..7555f4a 100644
--- a/dpms.h
+++ b/dpms.h
@@ -28,6 +28,9 @@ Equipment Corporation.
 ******************************************************************/
 /* $XFree86: xc/include/extensions/dpms.h,v 3.4 2000/03/15 16:51:51 tsi Exp $ */
 
+#ifndef _X11_EXTENSIONS_DPMS_H
+#define _X11_EXTENSIONS_DPMS_H 1
+
 /*
  * HISTORY
  */
@@ -46,6 +49,8 @@ Equipment Corporation.
 #include <X11/X.h>
 #include <X11/Xmd.h>
 
+_XFUNCPROTOBEGIN
+
 extern Bool DPMSQueryExtension(Display *, int *, int *);
 extern Status DPMSGetVersion(Display *, int *, int *);
 extern Bool DPMSCapable(Display *);
@@ -55,6 +60,8 @@ extern Status DPMSEnable(Display *);
 extern Status DPMSDisable(Display *);
 extern Status DPMSForceLevel(Display *, CARD16);
 extern Status DPMSInfo(Display *, CARD16 *, BOOL *);
-#endif
 
+_XFUNCPROTOEND
+#endif /* !DPMS_SERVER */
+#endif /* !_X11_EXTENSIONS_DPMS_H */
 
-- 
cgit v1.2.1