From 5a8166e87491748b3b5f38c43ceebea0a6beeb34 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Mon, 5 Jan 2026 19:35:32 +0100
Subject: [PATCH] replace obsolete "pointer" typedef by plain void*

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 src/driver.c       | 16 ++++++----------
 src/nested_input.c | 16 ++++++++--------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/driver.c b/src/driver.c
index 3edc84d..2f22440 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -61,9 +61,7 @@ static MODULESETUPPROTO(NestedSetup);
 static void NestedIdentify(int flags);
 static const OptionInfoRec *NestedAvailableOptions(int chipid, int busid);
 static Bool NestedProbe(DriverPtr drv, int flags);
-static Bool NestedDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op,
-                             pointer ptr);
-
+static Bool NestedDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, void *ptr);
 static Bool NestedPreInit(ScrnInfoPtr pScrn, int flags);
 static Bool NestedScreenInit(ScreenPtr pScreen, int argc, char **argv);
 
@@ -167,10 +165,8 @@ typedef struct NestedPrivate {
 #define PNESTED(p)    ((NestedPrivatePtr)((p)->driverPrivate))
 #define PCLIENTDATA(p) (PNESTED(p)->clientData)
 
-/*static ScrnInfoPtr NESTEDScrn;*/
-
-static pointer
-NestedSetup(pointer module, pointer opts, int *errmaj, int *errmin) {
+static void *
+NestedSetup(void *module, void *opts, int *errmaj, int *errmin) {
     static Bool setupDone = FALSE;
 
     if (!setupDone) {
@@ -179,7 +175,7 @@ NestedSetup(pointer module, pointer opts, int *errmaj, int *errmin) {
         xf86AddDriver(&NESTED, module, HaveDriverFuncs);
         xf86AddInputDriver(&NESTEDINPUT, module, 0);
 
-        return (pointer)1;
+        return (void*)1;
     } else {
         if (errmaj)
             *errmaj = LDR_ONCEONLY;
@@ -250,7 +246,7 @@ NestedProbe(DriverPtr drv, int flags) {
 #endif
 
 static Bool
-NestedDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, pointer ptr) {
+NestedDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, void *ptr) {
     CARD32 *flag;
     xf86Msg(X_INFO, "NestedDriverFunc\n");
 
@@ -514,7 +510,7 @@ NestedAddMode(ScrnInfoPtr pScrn, int width, int height) {
 // Wrapper for timed call to NestedInputLoadDriver.  Used with timer in order
 // to force the initialization to wait until the input core is initialized.
 static CARD32
-NestedMouseTimer(OsTimerPtr timer, CARD32 time, pointer arg) {
+NestedMouseTimer(OsTimerPtr timer, CARD32 time, void *arg) {
     NestedInputLoadDriver(arg);
     return 0;
 }
diff --git a/src/nested_input.c b/src/nested_input.c
index 470486e..ebbff52 100644
--- a/src/nested_input.c
+++ b/src/nested_input.c
@@ -57,10 +57,10 @@
 #define NUM_MOUSE_BUTTONS 6
 #define NUM_MOUSE_AXES 2
 
-static pointer
-NestedInputPlug(pointer module, pointer options, int *errmaj, int  *errmin);
+static void *
+NestedInputPlug(void *module, void *options, int *errmaj, int  *errmin);
 static void
-NestedInputUnplug(pointer p);
+NestedInputUnplug(void *p);
 
 static void
 NestedInputReadInput(InputInfoPtr pInfo);
@@ -121,13 +121,13 @@ void
 NestedInputUnInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) {
 }
 
-static pointer
-NestedInputPlug(pointer module, pointer options, int *errmaj, int  *errmin) {
+static void *
+NestedInputPlug(void *module, void *options, int *errmaj, int  *errmin) {
     return NULL;
 }
 
 static void
-NestedInputUnplug(pointer p) {
+NestedInputUnplug(void *p) {
 }
 
 static void
@@ -224,7 +224,7 @@ _nested_input_init_axes(DeviceIntPtr device) {
 }
 
 static CARD32
-nested_input_on(OsTimerPtr timer, CARD32 time, pointer arg) {
+nested_input_on(OsTimerPtr timer, CARD32 time, void *arg) {
     DeviceIntPtr device = arg;
     InputInfoPtr pInfo = device->public.devicePrivate;
     NestedInputDevicePtr pNestedInput = pInfo->private;
@@ -286,7 +286,7 @@ NestedInputControl(DeviceIntPtr device, int what) {
 }
 
 static CARD32
-nested_input_ready(OsTimerPtr timer, CARD32 time, pointer arg) {
+nested_input_ready(OsTimerPtr timer, CARD32 time, void *arg) {
     NestedClientPrivatePtr clientData = arg;
     NestedClientCheckEvents(clientData);
     return 0;