From 48b7dcef61651fb0aec958f569af14a21dfde4cf Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 31 Dec 2025 13:09:58 +0100 Subject: [PATCH] replace BLOCKHANDLER_ARGS_DECL and BLOCKHANDLER_ARGS Signed-off-by: Enrico Weigelt, metux IT consult --- src/compat-api.h | 3 --- src/radeon.h | 2 +- src/radeon_kms.c | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/compat-api.h b/src/compat-api.h index 45b78d4d..3866a3f8 100644 --- a/src/compat-api.h +++ b/src/compat-api.h @@ -26,7 +26,4 @@ #ifndef COMPAT_API_H #define COMPAT_API_H -#define BLOCKHANDLER_ARGS_DECL ScreenPtr pScreen, pointer pTimeout -#define BLOCKHANDLER_ARGS pScreen, pTimeout - #endif diff --git a/src/radeon.h b/src/radeon.h index b938e8a3..dfbdd0e2 100644 --- a/src/radeon.h +++ b/src/radeon.h @@ -487,7 +487,7 @@ typedef struct { Bool (*CloseScreen)(ScreenPtr pScreen); - void (*BlockHandler)(BLOCKHANDLER_ARGS_DECL); + void (*BlockHandler)(ScreenPtr pScreen, pointer pTimeout); void (*CreateFence) (ScreenPtr pScreen, struct _SyncFence *pFence, Bool initially_triggered); diff --git a/src/radeon_kms.c b/src/radeon_kms.c index 77377dc7..600d5817 100644 --- a/src/radeon_kms.c +++ b/src/radeon_kms.c @@ -1201,7 +1201,7 @@ radeon_scanout_flip(ScreenPtr pScreen, RADEONInfoPtr info, drmmode_fb_reference(pRADEONEnt->fd, &drmmode_crtc->flip_pending, fb); } -static void RADEONBlockHandler_KMS(BLOCKHANDLER_ARGS_DECL) +static void RADEONBlockHandler_KMS(ScreenPtr pScreen, pointer pTimeout) { ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); RADEONInfoPtr info = RADEONPTR(pScrn); @@ -1209,7 +1209,7 @@ static void RADEONBlockHandler_KMS(BLOCKHANDLER_ARGS_DECL) int c; pScreen->BlockHandler = info->BlockHandler; - (*pScreen->BlockHandler) (BLOCKHANDLER_ARGS); + pScreen->BlockHandler(pScreen, pTimeout); pScreen->BlockHandler = RADEONBlockHandler_KMS; if (!xf86ScreenToScrn(radeon_primary_screen(pScreen))->vtSema)