--- xorg-server-1.3.0.0/randr/rrxinerama.c.jx	2007-05-17 17:07:31.000000000 -0400

+++ xorg-server-1.3.0.0/randr/rrxinerama.c	2007-05-31 21:41:13.000000000 -0400

@@ -147,12 +147,6 @@

 }

 static Bool

-RRXineramaScreenActive (ScreenPtr pScreen)

-{

-    return rrGetScrPriv(pScreen) != NULL;

-}

-

-static Bool

 RRXineramaCrtcActive (RRCrtcPtr crtc)

 {

     return crtc->mode != NULL && crtc->numOutputs > 0;

@@ -164,7 +158,7 @@

     int	i, n;

     n = 0;

-    if (RRXineramaScreenActive (pScreen))

+    if (rrGetScrPriv (pScreen))

     {

 	rrScrPriv(pScreen);

 	for (i = 0; i < pScrPriv->numCrtcs; i++)

@@ -174,6 +168,12 @@

     return n;

 }

+static Bool

+RRXineramaScreenActive (ScreenPtr pScreen)

+{

+    return RRXineramaScreenCount (pScreen) > 0;

+}

+

 int

 ProcRRXineramaGetScreenCount(ClientPtr client)

 {