From 2ecda6541e9f2d3de517920eac6a6251c0d0de39 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 22 May 2024 16:22:13 +0200 Subject: [PATCH] drop ifdef on REGION_NULL It's always defined since our minimal version (1.18), so no need for extra ifdef's. Signed-off-by: Enrico Weigelt, metux IT consult Part-of: --- src/sis6326_video.c | 4 ---- src/sis_video.c | 8 -------- 2 files changed, 12 deletions(-) diff --git a/src/sis6326_video.c b/src/sis6326_video.c index a4747d7..e028d65 100644 --- a/src/sis6326_video.c +++ b/src/sis6326_video.c @@ -574,11 +574,7 @@ SIS6326SetupImageVideo(ScreenPtr pScreen) SIS6326SetPortDefaults(pScrn, pPriv); /* gotta uninit this someplace */ -#if defined(REGION_NULL) REGION_NULL(pScreen, &pPriv->clip); -#else - REGION_INIT(pScreen, &pPriv->clip, NullBox, 0); -#endif pSiS->adaptor = adapt; diff --git a/src/sis_video.c b/src/sis_video.c index d01a0da..5260289 100644 --- a/src/sis_video.c +++ b/src/sis_video.c @@ -939,11 +939,7 @@ SISSetupImageVideo(ScreenPtr pScreen) adapt->QueryImageAttributes = SISQueryImageAttributes; /* gotta uninit this someplace */ -#if defined(REGION_NULL) REGION_NULL(pScreen, &pPriv->clip); -#else - REGION_INIT(pScreen, &pPriv->clip, NullBox, 0); -#endif pSiS->adaptor = adapt; @@ -4012,11 +4008,7 @@ SISSetupBlitVideo(ScreenPtr pScreen) for(i = 0; i < NUM_BLIT_PORTS; i++) { adapt->pPortPrivates[i].uval = (ULong)(i); -#if defined(REGION_NULL) REGION_NULL(pScreen, &pPriv->blitClip[i]); -#else - REGION_INIT(pScreen, &pPriv->blitClip[i], NullBox, 0); -#endif pPriv->videoStatus[i] = 0; pPriv->currentBuf[i] = 0; pPriv->handle[i] = NULL;