xserver: Branch 'master' - 2 commits

[Adam Jackson]

 hw/xfree86/common/xf86Globals.c |    2 --
 hw/xfree86/common/xf86Privstr.h |    2 --
 2 files changed, 4 deletions(-)

New commits:
commit 75e495a4cd823b6fa42a8d167ecc9f4723320dea
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Aug 18 17:58:08 2008 -0400

    Remove unused xf86Info.mouseLocal

diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
index 54c934a..3052149 100644
--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
@@ -100,7 +100,6 @@ xf86InfoRec xf86Info = {
 	FALSE,		/* vtSysreq */
 	SKWhenNeeded,	/* ddxSpecialKeys */
 	NULL,		/* pMouse */
-	NULL,		/* mouseLocal */
 	-1,		/* lastEventTime */
 	FALSE,		/* vtRequestsPending */
 	FALSE,		/* dontVTSwitch */
diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
index 013c91e..12c700a 100644
--- a/hw/xfree86/common/xf86Privstr.h
+++ b/hw/xfree86/common/xf86Privstr.h
@@ -69,7 +69,6 @@ typedef struct {
 
     /* mouse part */
     DeviceIntPtr	pMouse;
-    pointer		mouseLocal;
 
     /* event handler part */
     int			lastEventTime;
commit b3dfd7e3e4deef21b40c885f8e7eae34b55888b2
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Aug 18 17:56:18 2008 -0400

    Remove unused xf86Info.sharedMonitor

diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
index 489b964..54c934a 100644
--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
@@ -108,7 +108,6 @@ xf86InfoRec xf86Info = {
 	FALSE,		/* dontZoom */
 	FALSE,		/* notrapSignals */
 	FALSE,		/* caughtSignal */
-	FALSE,		/* sharedMonitor */
 	NULL,		/* currentScreen */
 #ifdef CSRG_BASED
 	-1,		/* screenFd */
diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
index 8ae1f37..013c91e 100644
--- a/hw/xfree86/common/xf86Privstr.h
+++ b/hw/xfree86/common/xf86Privstr.h
@@ -81,7 +81,6 @@ typedef struct {
     Bool		caughtSignal;
 
     /* graphics part */
-    Bool		sharedMonitor;
     ScreenPtr		currentScreen;
 #if defined(CSRG_BASED) || defined(__FreeBSD_kernel__)
     int			screenFd;	/* fd for memory mapped access to