use void* instead pointer

this typedef just isn't needed, and going to be phased out in the SDK.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Joseph Crowell
2025-08-02 17:49:48 +10:00
parent 5dc629a43c
commit 60020bc22e
7 changed files with 12 additions and 14 deletions

View File

@@ -343,8 +343,7 @@ static void amdgpu_dri2_unref_buffer(BufferPtr buffer)
}
static void
amdgpu_dri2_client_state_changed(CallbackListPtr * cbl,
pointer data, pointer calldata)
amdgpu_dri2_client_state_changed(CallbackListPtr * cbl, void* data, void* calldata)
{
NewClientInfoRec *clientinfo = calldata;
ClientPtr pClient = clientinfo->client;
@@ -850,7 +849,7 @@ static int amdgpu_dri2_get_msc(DrawablePtr draw, CARD64 * ust, CARD64 * msc)
}
static
CARD32 amdgpu_dri2_deferred_event(OsTimerPtr timer, CARD32 now, pointer data)
CARD32 amdgpu_dri2_deferred_event(OsTimerPtr timer, CARD32 now, void* data)
{
DRI2FrameEventPtr event_info = (DRI2FrameEventPtr) data;
xf86CrtcPtr crtc = event_info->crtc;

View File

@@ -63,7 +63,7 @@ Bool amdgpu_glamor_create_screen_resources(ScreenPtr screen)
Bool amdgpu_glamor_pre_init(ScrnInfoPtr scrn)
{
AMDGPUInfoPtr info = AMDGPUPTR(scrn);
pointer glamor_module;
void* glamor_module;
CARD32 version;
if (scrn->depth < 15) {

View File

@@ -434,7 +434,7 @@ amdgpu_glamor_poly_fill_rect(DrawablePtr pDrawable, GCPtr pGC,
static void
amdgpu_glamor_image_glyph_blt(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph,
CharInfoPtr *ppci, pointer pglyphBase)
CharInfoPtr *ppci, void* pglyphBase)
{
ScrnInfoPtr scrn = xf86ScreenToScrn(pDrawable->pScreen);
PixmapPtr pixmap = get_drawable_pixmap(pDrawable);
@@ -453,7 +453,7 @@ amdgpu_glamor_image_glyph_blt(DrawablePtr pDrawable, GCPtr pGC,
static void
amdgpu_glamor_poly_glyph_blt(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph,
CharInfoPtr *ppci, pointer pglyphBase)
CharInfoPtr *ppci, void* pglyphBase)
{
ScrnInfoPtr scrn = xf86ScreenToScrn(pDrawable->pScreen);
PixmapPtr pixmap = get_drawable_pixmap(pDrawable);

View File

@@ -319,7 +319,7 @@ callback_needs_flush(AMDGPUInfoPtr info, struct amdgpu_client_priv *client_priv)
static void
amdgpu_event_callback(CallbackListPtr *list,
pointer user_data, pointer call_data)
void* user_data, void* call_data)
{
EventInfoRec *eventinfo = call_data;
ScrnInfoPtr pScrn = user_data;
@@ -354,7 +354,7 @@ amdgpu_event_callback(CallbackListPtr *list,
static void
amdgpu_flush_callback(CallbackListPtr *list,
pointer user_data, pointer call_data)
void* user_data, void* call_data)
{
ScrnInfoPtr pScrn = user_data;
ScreenPtr pScreen = pScrn->pScreen;
@@ -1805,7 +1805,7 @@ static void amdgpu_drop_drm_master(ScrnInfoPtr pScrn)
static
CARD32 cleanup_black_fb(OsTimerPtr timer, CARD32 now, pointer data)
CARD32 cleanup_black_fb(OsTimerPtr timer, CARD32 now, void* data)
{
ScreenPtr screen = data;
ScrnInfoPtr scrn = xf86ScreenToScrn(screen);

View File

@@ -47,8 +47,7 @@ static XF86ModuleVersionInfo AMDGPUVersionRec = {
*
* This function is called every time the module is loaded.
*/
static pointer
AMDGPUSetup(pointer Module, pointer Options, int *ErrorMajor, int *ErrorMinor)
static void *AMDGPUSetup(void* Module, void* Options, int *ErrorMajor, int *ErrorMinor)
{
static Bool Inited = FALSE;
@@ -57,7 +56,7 @@ AMDGPUSetup(pointer Module, pointer Options, int *ErrorMajor, int *ErrorMinor)
xf86AddDriver(&AMDGPU, Module, HaveDriverFuncs);
}
return (pointer) TRUE;
return (void*) TRUE;
}
/* The following record must be called amdgpuModuleData */

View File

@@ -28,7 +28,7 @@
#define HAVE_NOTIFY_FD 1
#define BLOCKHANDLER_ARGS_DECL ScreenPtr pScreen, pointer pTimeout
#define BLOCKHANDLER_ARGS_DECL ScreenPtr pScreen, void* pTimeout
#define BLOCKHANDLER_ARGS pScreen, pTimeout
#endif

View File

@@ -3073,7 +3073,7 @@ static void drmmode_notify_fd(int fd, int notify, void *data)
amdgpu_drm_handle_event(fd, &drmmode->event_context);
}
#else
static void drm_wakeup_handler(pointer data, int err, pointer p)
static void drm_wakeup_handler(void* data, int err, void* p)
{
drmmode_ptr drmmode = data;
AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(drmmode->scrn);