svn merge file:///D:/svnrepos/vcxsrv/branches/released .

1 files changed, 31 insertions, 39 deletions

diff --git a/xorg-server/Xext/dpms.c b/xorg-server/Xext/dpms.c
index be11fd76a..06425993b 100644
--- a/xorg-server/Xext/dpms.c
+++ b/xorg-server/Xext/dpms.c
@@ -70,30 +70,22 @@ static DISPATCH_PROC(ProcDPMSInfo);
 static DISPATCH_PROC(SProcDPMSInfo);
 static DISPATCH_PROC(ProcDPMSCapable);
 static DISPATCH_PROC(SProcDPMSCapable);
-static void DPMSResetProc(ExtensionEntry* extEntry);
 
 void
 DPMSExtensionInit(INITARGS)
 {
     AddExtension(DPMSExtensionName, 0, 0,
 		 ProcDPMSDispatch, SProcDPMSDispatch,
-		 DPMSResetProc, StandardMinorOpcode);
-}
-
-/*ARGSUSED*/
-static void
-DPMSResetProc (extEntry)
-    ExtensionEntry	*extEntry;
-{
+		 NULL, StandardMinorOpcode);
 }
 
 static int
 ProcDPMSGetVersion(client)
-    register ClientPtr client;
+    ClientPtr client;
 {
     /* REQUEST(xDPMSGetVersionReq); */
     xDPMSGetVersionReply rep;
-    register int n;
+    int n;
 
     REQUEST_SIZE_MATCH(xDPMSGetVersionReq);
 
@@ -112,11 +104,11 @@ ProcDPMSGetVersion(client)
 }
 
 static int
-ProcDPMSCapable(register ClientPtr client)
+ProcDPMSCapable(ClientPtr client)
 {
     /* REQUEST(xDPMSCapableReq); */
     xDPMSCapableReply rep;
-    register int n;
+    int n;
 
     REQUEST_SIZE_MATCH(xDPMSCapableReq);
 
@@ -134,11 +126,11 @@ ProcDPMSCapable(register ClientPtr client)
 
 static int
 ProcDPMSGetTimeouts(client)
-    register ClientPtr client;
+    ClientPtr client;
 {
     /* REQUEST(xDPMSGetTimeoutsReq); */
     xDPMSGetTimeoutsReply rep;
-    register int n;
+    int n;
 
     REQUEST_SIZE_MATCH(xDPMSGetTimeoutsReq);
 
@@ -161,7 +153,7 @@ ProcDPMSGetTimeouts(client)
 
 static int
 ProcDPMSSetTimeouts(client)
-    register ClientPtr client;
+    ClientPtr client;
 {
     REQUEST(xDPMSSetTimeoutsReq);
 
@@ -188,7 +180,7 @@ ProcDPMSSetTimeouts(client)
 
 static int
 ProcDPMSEnable(client)
-    register ClientPtr client;
+    ClientPtr client;
 {
     Bool was_enabled = DPMSEnabled;
 
@@ -205,7 +197,7 @@ ProcDPMSEnable(client)
 
 static int
 ProcDPMSDisable(client)
-    register ClientPtr client;
+    ClientPtr client;
 {
     /* REQUEST(xDPMSDisableReq); */
 
@@ -220,7 +212,7 @@ ProcDPMSDisable(client)
 
 static int
 ProcDPMSForceLevel(client)
-    register ClientPtr client;
+    ClientPtr client;
 {
     REQUEST(xDPMSForceLevelReq);
 
@@ -252,11 +244,11 @@ ProcDPMSForceLevel(client)
 }
 
 static int
-ProcDPMSInfo(register ClientPtr client)
+ProcDPMSInfo(ClientPtr client)
 {
     /* REQUEST(xDPMSInfoReq); */
     xDPMSInfoReply rep;
-    register int n;
+    int n;
 
     REQUEST_SIZE_MATCH(xDPMSInfoReq);
 
@@ -276,7 +268,7 @@ ProcDPMSInfo(register ClientPtr client)
 
 static int
 ProcDPMSDispatch (client)
-    register ClientPtr	client;
+    ClientPtr	client;
 {
     REQUEST(xReq);
 
@@ -305,9 +297,9 @@ ProcDPMSDispatch (client)
 
 static int
 SProcDPMSGetVersion(client)
-    register ClientPtr	client;
+    ClientPtr	client;
 {
-    register int n;
+    int n;
     REQUEST(xDPMSGetVersionReq);
 
     swaps(&stuff->length, n);
@@ -318,10 +310,10 @@ SProcDPMSGetVersion(client)
 }
 
 static int
-SProcDPMSCapable(register ClientPtr client)
+SProcDPMSCapable(ClientPtr client)
 {
     REQUEST(xDPMSCapableReq);
-    register int n;
+    int n;
 
     swaps(&stuff->length, n);
     REQUEST_SIZE_MATCH(xDPMSCapableReq);
@@ -331,10 +323,10 @@ SProcDPMSCapable(register ClientPtr client)
 
 static int
 SProcDPMSGetTimeouts(client)
-    register ClientPtr client;
+    ClientPtr client;
 {
     REQUEST(xDPMSGetTimeoutsReq);
-    register int n;
+    int n;
 
     swaps(&stuff->length, n);
     REQUEST_SIZE_MATCH(xDPMSGetTimeoutsReq);
@@ -344,10 +336,10 @@ SProcDPMSGetTimeouts(client)
 
 static int
 SProcDPMSSetTimeouts(client)
-    register ClientPtr client;
+    ClientPtr client;
 {
     REQUEST(xDPMSSetTimeoutsReq);
-    register int n;
+    int n;
 
     swaps(&stuff->length, n);
     REQUEST_SIZE_MATCH(xDPMSSetTimeoutsReq);
@@ -360,10 +352,10 @@ SProcDPMSSetTimeouts(client)
 
 static int
 SProcDPMSEnable(client)
-    register ClientPtr client;
+    ClientPtr client;
 {
     REQUEST(xDPMSEnableReq);
-    register int n;
+    int n;
 
     swaps(&stuff->length, n);
     REQUEST_SIZE_MATCH(xDPMSEnableReq);
@@ -373,10 +365,10 @@ SProcDPMSEnable(client)
 
 static int
 SProcDPMSDisable(client)
-    register ClientPtr client;
+    ClientPtr client;
 {
     REQUEST(xDPMSDisableReq);
-    register int n;
+    int n;
 
     swaps(&stuff->length, n);
     REQUEST_SIZE_MATCH(xDPMSDisableReq);
@@ -386,10 +378,10 @@ SProcDPMSDisable(client)
 
 static int
 SProcDPMSForceLevel(client)
-    register ClientPtr client;
+    ClientPtr client;
 {
     REQUEST(xDPMSForceLevelReq);
-    register int n;
+    int n;
 
     swaps(&stuff->length, n);
     REQUEST_SIZE_MATCH(xDPMSForceLevelReq);
@@ -401,10 +393,10 @@ SProcDPMSForceLevel(client)
 
 static int
 SProcDPMSInfo(client)
-    register ClientPtr client;
+    ClientPtr client;
 {
     REQUEST(xDPMSInfoReq);
-    register int n;
+    int n;
 
     swaps(&stuff->length, n);
     REQUEST_SIZE_MATCH(xDPMSInfoReq);
@@ -414,7 +406,7 @@ SProcDPMSInfo(client)
 
 static int
 SProcDPMSDispatch (client)
-    register ClientPtr	client;
+    ClientPtr	client;
 {
     REQUEST(xReq);
     switch (stuff->data)