svn merge ^/branches/released .

4 files changed, 0 insertions, 62 deletions

diff --git a/xorg-server/hw/xfree86/modes/xf86Cursors.c b/xorg-server/hw/xfree86/modes/xf86Cursors.c
index 090f29c2f..6886ad7b2 100644
--- a/xorg-server/hw/xfree86/modes/xf86Cursors.c
+++ b/xorg-server/hw/xfree86/modes/xf86Cursors.c
@@ -227,11 +227,7 @@ xf86_set_cursor_colors (ScrnInfoPtr scrn, int bg, int fg)
     CursorPtr		cursor = xf86_config->cursor;

     int			c;

     CARD8		*bits = cursor ?

-#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(7,0,0,0,0)

         dixLookupPrivate(&cursor->devPrivates, CursorScreenKey(screen))

-#else

-        cursor->devPriv[screen->myNum]

-#endif

       : NULL;

 

     /* Save ARGB versions of these colors */

@@ -630,11 +626,7 @@ xf86_reload_cursors (ScreenPtr screen)
 

     if (cursor)

     {

-#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(7,0,0,0,0)

 	void *src = dixLookupPrivate(&cursor->devPrivates, CursorScreenKey(screen));

-#else

-	void *src = cursor->devPriv[screen->myNum];

-#endif

 #ifdef ARGB_CURSOR

 	if (cursor->bits->argb && cursor_info->LoadCursorARGB)

 	    (*cursor_info->LoadCursorARGB) (scrn, cursor);

diff --git a/xorg-server/hw/xfree86/modes/xf86EdidModes.c b/xorg-server/hw/xfree86/modes/xf86EdidModes.c
index fc469c6ba..ecc1b110d 100644
--- a/xorg-server/hw/xfree86/modes/xf86EdidModes.c
+++ b/xorg-server/hw/xfree86/modes/xf86EdidModes.c
@@ -636,7 +636,6 @@ DDCModeFromDetailedTiming(int scrnIndex, struct detailed_timings *timing,
     return Mode;

 }

 

-#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(7,0,0,0,0)

 static DisplayModePtr

 DDCModesFromCVT(int scrnIndex, struct cvt_timings *t)

 {

@@ -665,7 +664,6 @@ DDCModesFromCVT(int scrnIndex, struct cvt_timings *t)
 

     return modes;

 }

-#endif

 

 static const struct {

     short w;

@@ -1021,12 +1019,10 @@ static void handle_detailed_modes(struct detailed_monitor_section *det_mon,
                                           p->quirks, p->timing_level,p->rb);

         p->Modes = xf86ModesAdd(p->Modes, Mode);

         break;

-#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(7,0,0,0,0)

     case DS_CVT:

         Mode = DDCModesFromCVT(p->DDC->scrnIndex, det_mon->section.cvt);

         p->Modes = xf86ModesAdd(p->Modes, Mode);

         break;

-#endif

     case DS_EST_III:

 	Mode = DDCModesFromEstIII(det_mon->section.est_iii);

 	p->Modes = xf86ModesAdd(p->Modes, Mode);

diff --git a/xorg-server/hw/xfree86/modes/xf86Modes.c b/xorg-server/hw/xfree86/modes/xf86Modes.c
index 0507e9812..6b34ec11c 100644
--- a/xorg-server/hw/xfree86/modes/xf86Modes.c
+++ b/xorg-server/hw/xfree86/modes/xf86Modes.c
@@ -38,14 +38,6 @@
 

 extern XF86ConfigPtr xf86configptr;

 

-/*

- * This is the version number where we epoched.  These files get copied

- * into drivers that want to use this setup infrastructure on pre-1.3

- * servers, so when that happens they need to define these symbols

- * themselves.  However, _in_ the server, we basically always define them now.

- */

-#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,2,99,2,0)

-

 /**

  * Calculates the horizontal sync rate of a mode.

  */

@@ -326,7 +318,6 @@ xf86PrintModeline(int scrnIndex,DisplayModePtr mode)
 		   mode->VTotal, flags, xf86ModeHSync(mode));

     free(flags);

 }

-#endif /* XORG_VERSION_CURRENT <= 7.2.99.2 */

 

 /**

  * Marks as bad any modes with unsupported flags.

@@ -503,12 +494,7 @@ xf86ValidateModesBandwidth(ScrnInfoPtr pScrn, DisplayModePtr modeList,
 

     for (mode = modeList; mode != NULL; mode = mode->next) {

 	if (xf86ModeBandwidth(mode, depth) > bandwidth)

-#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(7,0,0,0,0)

 	    mode->status = MODE_BANDWIDTH;

-#else

-	    /* MODE_BANDWIDTH didn't exist in xserver 1.2 */

-	    mode->status = MODE_BAD;

-#endif

     }

 }

 

diff --git a/xorg-server/hw/xfree86/modes/xf86RandR12.c b/xorg-server/hw/xfree86/modes/xf86RandR12.c
index 90e267c1e..92f34a222 100644
--- a/xorg-server/hw/xfree86/modes/xf86RandR12.c
+++ b/xorg-server/hw/xfree86/modes/xf86RandR12.c
@@ -69,21 +69,12 @@ static Bool xf86RandR12CreateScreenResources12 (ScreenPtr pScreen);
 #endif

 

 static int xf86RandR12Generation;

-#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(7,0,0,0,0)

 

 static DevPrivateKeyRec xf86RandR12KeyRec;

 static DevPrivateKey xf86RandR12Key;

 #define XF86RANDRINFO(p) ((XF86RandRInfoPtr) \

     dixLookupPrivate(&(p)->devPrivates, xf86RandR12Key))

 

-#else /* XORG_VERSION_CURRENT < 7.0 */

-

-static int xf86RandR12Index;

-#define XF86RANDRINFO(p) \

-    ((XF86RandRInfoPtr)(p)->devPrivates[xf86RandR12Index].ptr)

-

-#endif /* XORG_VERSION_CURRENT < 7.0 */

-

 

 static int

 xf86RandR12ModeRefresh (DisplayModePtr mode)

@@ -690,17 +681,13 @@ xf86RandR12ScreenSetSize (ScreenPtr	pScreen,
     Bool		ret = FALSE;

     int                 c;

 

-#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(7,0,0,0,0)

     if (xf86RandR12Key) {

-#endif

         if (randrp->virtualX == -1 || randrp->virtualY == -1)

         {

 	    randrp->virtualX = pScrn->virtualX;

 	    randrp->virtualY = pScrn->virtualY;

         }

-#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(7,0,0,0,0)

     }

-#endif

     if (pRoot && pScrn->vtSema)

 	(*pScrn->EnableDisableFBAccess) (pScreen->myNum, FALSE);

 

@@ -843,10 +830,8 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen)
 				  mmHeight);

     }

 

-#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(7,0,0,0,0)

     if (xf86RandR12Key == NULL)

 	return TRUE;

-#endif

 

     if (randrp->virtualX == -1 || randrp->virtualY == -1)

     {

@@ -882,13 +867,9 @@ xf86RandR12Init (ScreenPtr pScreen)
     if (xf86RandR12Generation != serverGeneration)

 	xf86RandR12Generation = serverGeneration;

 

-#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(7,0,0,0,0)

     xf86RandR12Key = &xf86RandR12KeyRec;

     if (!dixRegisterPrivateKey(&xf86RandR12KeyRec, PRIVATE_SCREEN, 0))

 	return FALSE;

-#else

-    xf86RandR12Index = AllocateScreenPrivateIndex();

-#endif

 

     randrp = malloc(sizeof (XF86RandRInfoRec));

     if (!randrp)

@@ -914,11 +895,7 @@ xf86RandR12Init (ScreenPtr pScreen)
 

     randrp->maxX = randrp->maxY = 0;

 

-#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(7,0,0,0,0)

     dixSetPrivate(&pScreen->devPrivates, xf86RandR12Key, randrp);

-#else

-    pScreen->devPrivates[xf86RandR12Index].ptr = randrp;

-#endif

 

 #if RANDR_12_INTERFACE

     if (!xf86RandR12Init12 (pScreen))

@@ -932,10 +909,8 @@ xf86RandR12CloseScreen (ScreenPtr pScreen)
 {

     XF86RandRInfoPtr	randrp;

 

-#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(7,0,0,0,0)

     if (xf86RandR12Key == NULL)

 	return;

-#endif

 

     randrp = XF86RANDRINFO(pScreen);

 #if RANDR_12_INTERFACE

@@ -955,10 +930,8 @@ xf86RandR12SetRotations (ScreenPtr pScreen, Rotation rotations)
     xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);

 #endif

 

-#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(7,0,0,0,0)

     if (xf86RandR12Key == NULL)

 	return;

-#endif

 

     randrp = XF86RANDRINFO(pScreen);

 #if RANDR_12_INTERFACE

@@ -981,10 +954,8 @@ xf86RandR12SetTransformSupport (ScreenPtr pScreen, Bool transforms)
     xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);

 #endif

 

-#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(7,0,0,0,0)

     if (xf86RandR12Key == NULL)

 	return;

-#endif

 

     randrp = XF86RANDRINFO(pScreen);

 #if RANDR_13_INTERFACE

@@ -1599,10 +1570,8 @@ xf86RandR12CreateScreenResources12 (ScreenPtr pScreen)
     ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];

     xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);

 

-#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(7,0,0,0,0)

     if (xf86RandR12Key == NULL)

 	return TRUE;

-#endif

 

     for (c = 0; c < config->num_crtc; c++)

         xf86RandR12CrtcNotify (config->crtc[c]->randr_crtc);

@@ -1624,13 +1593,8 @@ xf86RandR12TellChanged (ScreenPtr pScreen)
     xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);

     int			c;

 

-#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(7,0,0,0,0)

     if (xf86RandR12Key == NULL)

 	return;

-#else

-    if (!XF86RANDRINFO(pScreen))

-	return;

-#endif

 

     xf86RandR12SetInfo12 (pScreen);

     for (c = 0; c < config->num_crtc; c++)