xserver: Branch 'master'

[Peter Hutterer]

 dix/dispatch.c      |    6 ------
 include/dixstruct.h |    4 ----
 2 files changed, 10 deletions(-)

New commits:
commit 6583477035234e23ead2fad9db7a07e5862447a4
Author: Nicolai Hähnle <nhaehnle at gmail.com>
Date:   Sat May 23 13:35:24 2009 +0200

    Remove reference to non-existing requestLog and requestLogIndex
    
    These fields were removed in 252ec504817e05b185e4896a2d899e9c00b8aeef.
    
    Signed-off-by: Nicolai Haehnle <nhaehnle at gmail.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/dix/dispatch.c b/dix/dispatch.c
index ce3294d..dbb97e0 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -413,12 +413,6 @@ Dispatch(void)
 	        }
 
 		client->sequence++;
-#ifdef DEBUG
-		if (client->requestLogIndex == MAX_REQUEST_LOG)
-		    client->requestLogIndex = 0;
-		client->requestLog[client->requestLogIndex] = MAJOROP;
-		client->requestLogIndex++;
-#endif
 #ifdef XSERVER_DTRACE
 		XSERVER_REQUEST_START(LookupMajorName(MAJOROP), MAJOROP,
 			      ((xReq *)client->requestBuffer)->length,
diff --git a/include/dixstruct.h b/include/dixstruct.h
index 7335fad..696b793 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -37,10 +37,6 @@ SOFTWARE.
  *      translation from client ids to server addresses.
  */
 
-#ifdef DEBUG
-#define MAX_REQUEST_LOG 100
-#endif
-
 extern _X_EXPORT CallbackListPtr ClientStateCallback;
 
 typedef struct {