daemonratte/xf86-video-ati
Watch
1
0
Fork
You've already forked xf86-video-ati
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

replace BLOCKHANDLER_ARGS_DECL and BLOCKHANDLER_ARGS

Browse source 
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-12-31 13:09:58 +01:00
commit 48b7dcef61
3 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/compat-api.h
View file

@ -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

2
src/radeon.h
View file

@ -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);

4
src/radeon_kms.c
View file

@ -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)