aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/Xext
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-12-28 13:03:52 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-12-28 13:03:52 +0100
commitedce25213ffc81389909c827c9aaac27b736b483 (patch)
treea97ab98a06147cd5fb194063a9984dc3973fba55 /nx-X11/programs/Xserver/Xext
parente9f44221b2520a1d894b3c125269b5d10438453b (diff)
parent68dd0b52e13c844d662192654fb10cb993257a59 (diff)
downloadnx-libs-edce25213ffc81389909c827c9aaac27b736b483.tar.gz
nx-libs-edce25213ffc81389909c827c9aaac27b736b483.tar.bz2
nx-libs-edce25213ffc81389909c827c9aaac27b736b483.zip
Merge branch 'sunweaver-pr/change-pointer-into-void' into 3.6.x
Attributes GH PR #54: https://github.com/ArcticaProject/nx-libs/pull/54
Diffstat (limited to 'nx-X11/programs/Xserver/Xext')
-rw-r--r--nx-X11/programs/Xserver/Xext/appgroup.c14
-rw-r--r--nx-X11/programs/Xserver/Xext/appgroup.h4
-rw-r--r--nx-X11/programs/Xserver/Xext/extmod/modinit.c8
-rw-r--r--nx-X11/programs/Xserver/Xext/mbuf.c58
-rw-r--r--nx-X11/programs/Xserver/Xext/mbufbf.c6
-rw-r--r--nx-X11/programs/Xserver/Xext/mbufpx.c6
-rw-r--r--nx-X11/programs/Xserver/Xext/panoramiX.c18
-rw-r--r--nx-X11/programs/Xserver/Xext/panoramiXsrv.h2
-rw-r--r--nx-X11/programs/Xserver/Xext/saver.c14
-rw-r--r--nx-X11/programs/Xserver/Xext/security.c22
-rw-r--r--nx-X11/programs/Xserver/Xext/shape.c18
-rw-r--r--nx-X11/programs/Xserver/Xext/shm.c22
-rw-r--r--nx-X11/programs/Xserver/Xext/sleepuntil.c38
-rw-r--r--nx-X11/programs/Xserver/Xext/sleepuntil.h4
-rw-r--r--nx-X11/programs/Xserver/Xext/sync.c68
-rw-r--r--nx-X11/programs/Xserver/Xext/vidmodeproc.h32
-rw-r--r--nx-X11/programs/Xserver/Xext/xevie.c26
-rw-r--r--nx-X11/programs/Xserver/Xext/xf86dga2.c8
-rw-r--r--nx-X11/programs/Xserver/Xext/xf86misc.c12
-rw-r--r--nx-X11/programs/Xserver/Xext/xf86miscproc.h20
-rw-r--r--nx-X11/programs/Xserver/Xext/xf86vmode.c20
-rw-r--r--nx-X11/programs/Xserver/Xext/xres.c6
-rw-r--r--nx-X11/programs/Xserver/Xext/xtest1dd.c2
-rw-r--r--nx-X11/programs/Xserver/Xext/xtest1di.c4
-rw-r--r--nx-X11/programs/Xserver/Xext/xvmain.c28
-rw-r--r--nx-X11/programs/Xserver/Xext/xvmc.c12
-rw-r--r--nx-X11/programs/Xserver/Xext/xvmcext.h8
27 files changed, 240 insertions, 240 deletions
diff --git a/nx-X11/programs/Xserver/Xext/appgroup.c b/nx-X11/programs/Xserver/Xext/appgroup.c
index ad4afa9e4..e23ceca59 100644
--- a/nx-X11/programs/Xserver/Xext/appgroup.c
+++ b/nx-X11/programs/Xserver/Xext/appgroup.c
@@ -92,7 +92,7 @@ extern int connBlockScreenStart;
static
int XagAppGroupFree(
- pointer what,
+ void * what,
XID id) /* unused */
{
int i;
@@ -126,8 +126,8 @@ int XagAppGroupFree(
/* static */
void XagClientStateChange(
CallbackListPtr* pcbl,
- pointer nulldata,
- pointer calldata)
+ void * nulldata,
+ void * calldata)
{
SecurityAuthorizationPtr pAuth;
NewClientInfoRec* pci = (NewClientInfoRec*) calldata;
@@ -262,7 +262,7 @@ void XagResetProc(
{
DeleteCallback (&ClientStateCallback, XagClientStateChange, NULL);
XagCallbackRefCount = 0;
- while (appGrpList) XagAppGroupFree ((pointer) appGrpList, 0);
+ while (appGrpList) XagAppGroupFree ((void *) appGrpList, 0);
}
static
@@ -476,7 +476,7 @@ int ProcXagCreate (
return BadAlloc;
ret = AttrValidate (client, stuff->attrib_mask, pAppGrp);
if (ret != Success) {
- XagAppGroupFree ((pointer)pAppGrp, (XID)0);
+ XagAppGroupFree ((void *)pAppGrp, (XID)0);
return ret;
}
if (pAppGrp->single_screen) {
@@ -484,7 +484,7 @@ int ProcXagCreate (
if (!pAppGrp->ConnectionInfo)
return BadAlloc;
}
- if (!AddResource (stuff->app_group, RT_APPGROUP, (pointer)pAppGrp))
+ if (!AddResource (stuff->app_group, RT_APPGROUP, (void *)pAppGrp))
return BadAlloc;
if (XagCallbackRefCount++ == 0)
(void) AddCallback (&ClientStateCallback, XagClientStateChange, NULL);
@@ -824,6 +824,6 @@ void XagCallClientStateChange(
NewClientInfoRec clientinfo;
clientinfo.client = client;
- XagClientStateChange (NULL, NULL, (pointer)&clientinfo);
+ XagClientStateChange (NULL, NULL, (void *)&clientinfo);
}
}
diff --git a/nx-X11/programs/Xserver/Xext/appgroup.h b/nx-X11/programs/Xserver/Xext/appgroup.h
index 05c9ef124..2a8feb585 100644
--- a/nx-X11/programs/Xserver/Xext/appgroup.h
+++ b/nx-X11/programs/Xserver/Xext/appgroup.h
@@ -2,8 +2,8 @@
void XagClientStateChange(
CallbackListPtr* pcbl,
- pointer nulldata,
- pointer calldata);
+ void * nulldata,
+ void * calldata);
int ProcXagCreate (
register ClientPtr client);
int ProcXagDestroy(
diff --git a/nx-X11/programs/Xserver/Xext/extmod/modinit.c b/nx-X11/programs/Xserver/Xext/extmod/modinit.c
index 3c2044f78..f79204281 100644
--- a/nx-X11/programs/Xserver/Xext/extmod/modinit.c
+++ b/nx-X11/programs/Xserver/Xext/extmod/modinit.c
@@ -232,8 +232,8 @@ static XF86ModuleVersionInfo VersRec =
*/
XF86ModuleData extmodModuleData = { &VersRec, extmodSetup, NULL };
-static pointer
-extmodSetup(pointer module, pointer opts, int *errmaj, int *errmin)
+static void *
+extmodSetup(void * module, void * opts, int *errmaj, int *errmin)
{
int i;
@@ -244,7 +244,7 @@ extmodSetup(pointer module, pointer opts, int *errmaj, int *errmin)
char *s;
s = (char *)xalloc(strlen(extensionModules[i].name) + 5);
if (s) {
- pointer o;
+ void * o;
strcpy(s, "omit");
strcat(s, extensionModules[i].name);
o = xf86FindOption(opts, s);
@@ -258,7 +258,7 @@ extmodSetup(pointer module, pointer opts, int *errmaj, int *errmin)
LoadExtension(&extensionModules[i], FALSE);
}
/* Need a non-NULL return */
- return (pointer)1;
+ return (void *)1;
}
#endif /* XFree86LOADER */
diff --git a/nx-X11/programs/Xserver/Xext/mbuf.c b/nx-X11/programs/Xserver/Xext/mbuf.c
index 3129edd87..37024da19 100644
--- a/nx-X11/programs/Xserver/Xext/mbuf.c
+++ b/nx-X11/programs/Xserver/Xext/mbuf.c
@@ -107,7 +107,7 @@ static int EventSelectForMultibuffer(
*/
RESTYPE MultibufferDrawableResType;
static int MultibufferDrawableDelete (
- pointer /* value */,
+ void * /* value */,
XID /* id */
);
/*
@@ -117,7 +117,7 @@ static int MultibufferDrawableDelete (
*/
static RESTYPE MultibufferResType;
static int MultibufferDelete (
- pointer /* value */,
+ void * /* value */,
XID /* id */
);
@@ -127,7 +127,7 @@ static int MultibufferDelete (
*/
static RESTYPE MultibuffersResType;
static int MultibuffersDelete (
- pointer /* value */,
+ void * /* value */,
XID /* id */
);
@@ -137,7 +137,7 @@ static int MultibuffersDelete (
*/
static RESTYPE OtherClientResType;
static int OtherClientDelete (
- pointer /* value */,
+ void * /* value */,
XID /* id */
);
@@ -229,7 +229,7 @@ MultibufferExtensionInit()
xfree (screenInfo.screens[j]->devPrivates[MultibufferScreenIndex].ptr);
return;
}
- pScreen->devPrivates[MultibufferScreenIndex].ptr = (pointer) pMultibufferScreen;
+ pScreen->devPrivates[MultibufferScreenIndex].ptr = (void *) pMultibufferScreen;
/*
* wrap PositionWindow to resize the pixmap when the window
* changes size
@@ -312,7 +312,7 @@ SetupBackgroundPainter (pWin, pGC)
WindowPtr pWin;
GCPtr pGC;
{
- pointer gcvalues[4];
+ void *gcvalues[4];
int ts_x_origin, ts_y_origin;
PixUnion background;
int backgroundState;
@@ -337,21 +337,21 @@ SetupBackgroundPainter (pWin, pGC)
switch (backgroundState)
{
case BackgroundPixel:
- gcvalues[0] = (pointer) background.pixel;
- gcvalues[1] = (pointer) FillSolid;
+ gcvalues[0] = (void *) background.pixel;
+ gcvalues[1] = (void *) FillSolid;
gcmask = GCForeground|GCFillStyle;
break;
case BackgroundPixmap:
- gcvalues[0] = (pointer) FillTiled;
- gcvalues[1] = (pointer) background.pixmap;
- gcvalues[2] = (pointer)(long) ts_x_origin;
- gcvalues[3] = (pointer)(long) ts_y_origin;
+ gcvalues[0] = (void *) FillTiled;
+ gcvalues[1] = (void *) background.pixmap;
+ gcvalues[2] = (void *)(long) ts_x_origin;
+ gcvalues[3] = (void *)(long) ts_y_origin;
gcmask = GCFillStyle|GCTile|GCTileStipXOrigin|GCTileStipYOrigin;
break;
default:
- gcvalues[0] = (pointer) GXnoop;
+ gcvalues[0] = (void *) GXnoop;
gcmask = GCFunction;
}
DoChangeGC(pGC, gcmask, (XID *)gcvalues, TRUE);
@@ -381,7 +381,7 @@ CreateImageBuffers (pWin, nbuf, ids, action, hint)
pMultibuffers->pWindow = pWin;
pMultibuffers->buffers = (MultibufferPtr) (pMultibuffers + 1);
pMultibuffers->refcnt = pMultibuffers->numMultibuffer = 0;
- if (!AddResource (pWin->drawable.id, MultibuffersResType, (pointer) pMultibuffers))
+ if (!AddResource (pWin->drawable.id, MultibuffersResType, (void *) pMultibuffers))
return BadAlloc;
width = pWin->drawable.width;
height = pWin->drawable.height;
@@ -407,12 +407,12 @@ CreateImageBuffers (pWin, nbuf, ids, action, hint)
pMultibuffer->side = MultibufferSideMono;
pMultibuffer->clobber = MultibufferUnclobbered;
pMultibuffer->pMultibuffers = pMultibuffers;
- if (!AddResource (ids[i], MultibufferResType, (pointer) pMultibuffer))
+ if (!AddResource (ids[i], MultibufferResType, (void *) pMultibuffer))
break;
pMultibuffer->pPixmap = (*pScreen->CreatePixmap) (pScreen, width, height, depth);
if (!pMultibuffer->pPixmap)
break;
- if (!AddResource (ids[i], MultibufferDrawableResType, (pointer) pMultibuffer->pPixmap))
+ if (!AddResource (ids[i], MultibufferDrawableResType, (void *) pMultibuffer->pPixmap))
{
FreeResource (ids[i], MultibufferResType);
(*pScreen->DestroyPixmap) (pMultibuffer->pPixmap);
@@ -439,7 +439,7 @@ CreateImageBuffers (pWin, nbuf, ids, action, hint)
pMultibuffers->lastUpdate.milliseconds = 0;
pMultibuffers->width = width;
pMultibuffers->height = height;
- pWin->devPrivates[MultibufferWindowIndex].ptr = (pointer) pMultibuffers;
+ pWin->devPrivates[MultibufferWindowIndex].ptr = (void *) pMultibuffers;
if (pClearGC) FreeScratchGC(pClearGC);
return Success;
}
@@ -693,7 +693,7 @@ ProcGetMBufferAttributes (client)
(char *)&rep);
WriteToClient (client, (int)(pMultibuffers->numMultibuffer * sizeof (XID)),
(char *)ids);
- DEALLOCATE_LOCAL((pointer) ids);
+ DEALLOCATE_LOCAL((void *) ids);
return client->noClientException;
}
@@ -842,9 +842,9 @@ ProcGetBufferInfo (client)
k++;
}
}
- WriteToClient (client, sizeof (xMbufGetBufferInfoReply), (pointer) &rep);
- WriteToClient (client, (int) nInfo * sizeof (xMbufBufferInfo), (pointer) pInfo);
- DEALLOCATE_LOCAL ((pointer) pInfo);
+ WriteToClient (client, sizeof (xMbufGetBufferInfoReply), (void *) &rep);
+ WriteToClient (client, (int) nInfo * sizeof (xMbufBufferInfo), (void *) pInfo);
+ DEALLOCATE_LOCAL ((void *) pInfo);
return client->noClientException;
}
@@ -1463,7 +1463,7 @@ AliasMultibuffer (pMultibuffers, i)
pMultibuffer = &pMultibuffers->buffers[pMultibuffers->displayedMultibuffer];
ChangeResourceValue (pMultibuffer->pPixmap->drawable.id,
MultibufferDrawableResType,
- (pointer) pMultibuffer->pPixmap);
+ (void *) pMultibuffer->pPixmap);
}
/*
* make the new association
@@ -1471,7 +1471,7 @@ AliasMultibuffer (pMultibuffers, i)
pMultibuffer = &pMultibuffers->buffers[i];
ChangeResourceValue (pMultibuffer->pPixmap->drawable.id,
MultibufferDrawableResType,
- (pointer) pMultibuffers->pWindow);
+ (void *) pMultibuffers->pWindow);
pMultibuffers->displayedMultibuffer = i;
}
@@ -1608,7 +1608,7 @@ MultibufferPositionWindow (pWin, x, y)
{
ChangeResourceValue (pPixmap->drawable.id,
MultibufferDrawableResType,
- (pointer) pPixmap);
+ (void *) pPixmap);
}
}
FreeScratchGC (pGC);
@@ -1619,7 +1619,7 @@ MultibufferPositionWindow (pWin, x, y)
/*ARGSUSED*/
static int
MultibufferDrawableDelete (value, id)
- pointer value;
+ void *value;
XID id;
{
DrawablePtr pDrawable = (DrawablePtr)value;
@@ -1645,7 +1645,7 @@ MultibufferDrawableDelete (value, id)
/*ARGSUSED*/
static int
MultibufferDelete (value, id)
- pointer value;
+ void *value;
XID id;
{
MultibufferPtr pMultibuffer = (MultibufferPtr)value;
@@ -1665,7 +1665,7 @@ MultibufferDelete (value, id)
/*ARGSUSED*/
static int
MultibuffersDelete (value, id)
- pointer value;
+ void *value;
XID id;
{
MultibuffersPtr pMultibuffers = (MultibuffersPtr)value;
@@ -1682,7 +1682,7 @@ MultibuffersDelete (value, id)
/* Resource delete func for OtherClientResType */
static int
OtherClientDelete (value, id)
- pointer value;
+ void *value;
XID id;
{
MultibufferPtr pMultibuffer = (MultibufferPtr)value;
@@ -1745,7 +1745,7 @@ EventSelectForMultibuffer (pMultibuffer, client, mask)
return BadAlloc;
other->mask = mask;
other->resource = FakeClientID (client->index);
- if (!AddResource (other->resource, OtherClientResType, (pointer) pMultibuffer))
+ if (!AddResource (other->resource, OtherClientResType, (void *) pMultibuffer))
{
xfree (other);
return BadAlloc;
diff --git a/nx-X11/programs/Xserver/Xext/mbufbf.c b/nx-X11/programs/Xserver/Xext/mbufbf.c
index 8585c52d2..84e7ee839 100644
--- a/nx-X11/programs/Xserver/Xext/mbufbf.c
+++ b/nx-X11/programs/Xserver/Xext/mbufbf.c
@@ -230,7 +230,7 @@ bufMultibufferInit(pScreen, pMBScreen)
if (!pMBPriv)
return (FALSE);
- pMBScreen->devPrivate.ptr = (pointer) pMBPriv;
+ pMBScreen->devPrivate.ptr = (void *) pMBPriv;
pMBPriv->frameBuffer = bufFrameBuffer[pScreen->myNum];
pMBPriv->selectPlane = bufselectPlane[pScreen->myNum];
@@ -374,7 +374,7 @@ bufCreateImageBuffers (pWin, nbuf, ids, action, hint)
pMBScreen = MB_SCREEN_PRIV(pScreen);
pMBWindow = MB_WINDOW_PRIV(pWin);
- pMBWindow->devPrivate.ptr = (pointer) REGION_CREATE(pScreen, 0,0);
+ pMBWindow->devPrivate.ptr = (void *) REGION_CREATE(pScreen, 0,0);
if (!pMBWindow->devPrivate.ptr)
return(0);
REGION_COPY(pScreen, (RegionPtr) pMBWindow->devPrivate.ptr,
@@ -389,7 +389,7 @@ bufCreateImageBuffers (pWin, nbuf, ids, action, hint)
break;
if (!AddResource (ids[i], MultibufferDrawableResType,
- (pointer) pMBBuffer->pDrawable))
+ (void *) pMBBuffer->pDrawable))
{
bufDestroyBuffer((BufferPtr) pMBBuffer->pDrawable);
break;
diff --git a/nx-X11/programs/Xserver/Xext/mbufpx.c b/nx-X11/programs/Xserver/Xext/mbufpx.c
index c986217ee..0973fc324 100644
--- a/nx-X11/programs/Xserver/Xext/mbufpx.c
+++ b/nx-X11/programs/Xserver/Xext/mbufpx.c
@@ -124,7 +124,7 @@ pixMultibufferInit(pScreen, pMBScreen)
xfree(pInfo);
return (FALSE);
}
- pMBScreen->devPrivate.ptr = (pointer) pMBPriv;
+ pMBScreen->devPrivate.ptr = (void *) pMBPriv;
pMBPriv->PositionWindow = NULL;
pMBPriv->funcsWrapped = 0;
@@ -162,7 +162,7 @@ pixCreateImageBuffers (pWin, nbuf, ids, action, hint)
break;
if (!AddResource (ids[i], MultibufferDrawableResType,
- (pointer) pMBBuffer->pDrawable))
+ (void *) pMBBuffer->pDrawable))
{
(*pScreen->DestroyPixmap) ((PixmapPtr) pMBBuffer->pDrawable);
break;
@@ -570,7 +570,7 @@ pixPositionWindow (pWin, x, y)
{
ChangeResourceValue (pPixmap->drawable.id,
MultibufferDrawableResType,
- (pointer) pPixmap);
+ (void *) pPixmap);
}
}
FreeScratchGC (pGC);
diff --git a/nx-X11/programs/Xserver/Xext/panoramiX.c b/nx-X11/programs/Xserver/Xext/panoramiX.c
index a1a5b9f1f..2dc011e70 100644
--- a/nx-X11/programs/Xserver/Xext/panoramiX.c
+++ b/nx-X11/programs/Xserver/Xext/panoramiX.c
@@ -133,7 +133,7 @@ static void XineramaValidateGC(GCPtr, unsigned long, DrawablePtr);
static void XineramaChangeGC(GCPtr, unsigned long);
static void XineramaCopyGC(GCPtr, unsigned long, GCPtr);
static void XineramaDestroyGC(GCPtr);
-static void XineramaChangeClip(GCPtr, int, pointer, int);
+static void XineramaChangeClip(GCPtr, int, void *, int);
static void XineramaDestroyClip(GCPtr);
static void XineramaCopyClip(GCPtr, GCPtr);
@@ -165,7 +165,7 @@ XineramaCloseScreen (int i, ScreenPtr pScreen)
if (pScreen->myNum == 0)
REGION_UNINIT(pScreen, &PanoramiXScreenRegion);
- xfree ((pointer) pScreenPriv);
+ xfree ((void *) pScreenPriv);
return (*pScreen->CloseScreen) (i, pScreen);
}
@@ -308,7 +308,7 @@ static void
XineramaChangeClip (
GCPtr pGC,
int type,
- pointer pvalue,
+ void *pvalue,
int nrects
){
Xinerama_GC_FUNC_PROLOGUE (pGC);
@@ -335,7 +335,7 @@ XineramaDestroyClip(GCPtr pGC)
int
-XineramaDeleteResource(pointer data, XID id)
+XineramaDeleteResource(void * data, XID id)
{
xfree(data);
return 1;
@@ -343,7 +343,7 @@ XineramaDeleteResource(pointer data, XID id)
static Bool
-XineramaFindIDOnAnyScreen(pointer resource, XID id, pointer privdata)
+XineramaFindIDOnAnyScreen(void * resource, XID id, void * privdata)
{
PanoramiXRes *res = (PanoramiXRes*)resource;
int j;
@@ -368,7 +368,7 @@ typedef struct {
static Bool
-XineramaFindIDByScrnum(pointer resource, XID id, pointer privdata)
+XineramaFindIDByScrnum(void * resource, XID id, void * privdata)
{
PanoramiXRes *res = (PanoramiXRes*)resource;
PanoramiXSearchData *data = (PanoramiXSearchData*)privdata;
@@ -541,7 +541,7 @@ void PanoramiXExtensionInit(int argc, char *argv[])
pScreenPriv = xalloc(sizeof(PanoramiXScreenRec));
pScreen->devPrivates[PanoramiXScreenIndex].ptr =
- (pointer)pScreenPriv;
+ (void *)pScreenPriv;
if(!pScreenPriv) {
noPanoramiXExtension = TRUE;
return;
@@ -747,9 +747,9 @@ Bool PanoramiXCreateConnectionBlock(void)
root->mmHeight *= height_mult;
while(ConnectionCallbackList) {
- pointer tmp;
+ void *tmp;
- tmp = (pointer)ConnectionCallbackList;
+ tmp = (void *)ConnectionCallbackList;
(*ConnectionCallbackList->func)();
ConnectionCallbackList = ConnectionCallbackList->next;
xfree(tmp);
diff --git a/nx-X11/programs/Xserver/Xext/panoramiXsrv.h b/nx-X11/programs/Xserver/Xext/panoramiXsrv.h
index dc3b3d805..8fa2d3d05 100644
--- a/nx-X11/programs/Xserver/Xext/panoramiXsrv.h
+++ b/nx-X11/programs/Xserver/Xext/panoramiXsrv.h
@@ -22,7 +22,7 @@ extern PanoramiXRes * PanoramiXFindIDByScrnum(RESTYPE, XID, int);
extern PanoramiXRes * PanoramiXFindIDOnAnyScreen(RESTYPE, XID);
extern WindowPtr PanoramiXChangeWindow(int, WindowPtr);
extern Bool XineramaRegisterConnectionBlockCallback(void (*func)(void));
-extern int XineramaDeleteResource(pointer, XID);
+extern int XineramaDeleteResource(void *, XID);
extern void XineramaReinitData(ScreenPtr);
diff --git a/nx-X11/programs/Xserver/Xext/saver.c b/nx-X11/programs/Xserver/Xext/saver.c
index 14b0d2751..4a7fc054c 100644
--- a/nx-X11/programs/Xserver/Xext/saver.c
+++ b/nx-X11/programs/Xserver/Xext/saver.c
@@ -139,7 +139,7 @@ typedef struct _ScreenSaverEvent {
} ScreenSaverEventRec;
static int ScreenSaverFreeEvents(
- pointer /* value */,
+ void * /* value */,
XID /* id */
);
@@ -179,7 +179,7 @@ typedef struct _ScreenSaverAttr {
} ScreenSaverAttrRec, *ScreenSaverAttrPtr;
static int ScreenSaverFreeAttr (
- pointer /* value */,
+ void * /* value */,
XID /* id */
);
@@ -213,7 +213,7 @@ MakeScreenPrivate (
static int ScreenPrivateIndex;
#define GetScreenPrivate(s) ((ScreenSaverScreenPrivatePtr)(s)->devPrivates[ScreenPrivateIndex].ptr)
-#define SetScreenPrivate(s,v) ((s)->devPrivates[ScreenPrivateIndex].ptr = (pointer) v);
+#define SetScreenPrivate(s,v) ((s)->devPrivates[ScreenPrivateIndex].ptr = (void *) v);
#define SetupScreen(s) ScreenSaverScreenPrivatePtr pPriv = (s ? GetScreenPrivate(s) : NULL)
#define New(t) ((t *) xalloc (sizeof (t)))
@@ -356,7 +356,7 @@ setEventMask (pScreen, client, mask)
pEv->client = client;
pEv->screen = pScreen;
pEv->resource = FakeClientID (client->index);
- if (!AddResource (pEv->resource, EventType, (pointer) pEv))
+ if (!AddResource (pEv->resource, EventType, (void *) pEv))
return FALSE;
}
pEv->mask = mask;
@@ -390,7 +390,7 @@ FreeScreenAttr (pAttr)
static int
ScreenSaverFreeEvents (value, id)
- pointer value;
+ void * value;
XID id;
{
ScreenSaverEventPtr pOld = (ScreenSaverEventPtr)value;
@@ -413,7 +413,7 @@ ScreenSaverFreeEvents (value, id)
static int
ScreenSaverFreeAttr (value, id)
- pointer value;
+ void * value;
XID id;
{
ScreenSaverAttrPtr pOldAttr = (ScreenSaverAttrPtr)value;
@@ -1163,7 +1163,7 @@ ScreenSaverSetAttributes (ClientPtr client)
FreeScreenAttr (pPriv->attr);
pPriv->attr = pAttr;
pAttr->resource = FakeClientID (client->index);
- if (!AddResource (pAttr->resource, AttrType, (pointer) pAttr))
+ if (!AddResource (pAttr->resource, AttrType, (void *) pAttr))
return BadAlloc;
return Success;
PatchUp:
diff --git a/nx-X11/programs/Xserver/Xext/security.c b/nx-X11/programs/Xserver/Xext/security.c
index 8e97a7e54..4bc49f408 100644
--- a/nx-X11/programs/Xserver/Xext/security.c
+++ b/nx-X11/programs/Xserver/Xext/security.c
@@ -288,7 +288,7 @@ SecurityAudit(char *format, ...)
static int
SecurityDeleteAuthorization(
- pointer value,
+ void * value,
XID id)
{
SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr)value;
@@ -347,7 +347,7 @@ SecurityDeleteAuthorization(
/* resource delete function for RTEventClient */
static int
SecurityDeleteAuthorizationEventClient(
- pointer value,
+ void * value,
XID id)
{
OtherClientsPtr pEventClient, prev = NULL;
@@ -432,7 +432,7 @@ static CARD32
SecurityAuthorizationExpired(
OsTimerPtr timer,
CARD32 time,
- pointer pval)
+ void * pval)
{
SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr)pval;
@@ -538,7 +538,7 @@ SecurityEventSelectForAuthorization(
pEventClient->resource = FakeClientID(client->index);
pEventClient->next = pAuth->eventClients;
if (!AddResource(pEventClient->resource, RTEventClient,
- (pointer)pAuth))
+ (void *)pAuth))
{
xfree(pEventClient);
return BadAlloc;
@@ -624,7 +624,7 @@ ProcSecurityGenerateAuthorization(
SecurityValidateGroupInfoRec vgi;
vgi.group = group;
vgi.valid = FALSE;
- CallCallbacks(&SecurityValidateGroupCallback, (pointer)&vgi);
+ CallCallbacks(&SecurityValidateGroupCallback, (void *)&vgi);
/* if nobody said they recognized it, it's an error */
@@ -1065,7 +1065,7 @@ SecurityCheckDeviceAccess(client, dev, fromRequest)
* resource access.
*/
-static pointer
+static void *
SecurityAuditResourceIDAccess(
ClientPtr client,
XID id)
@@ -1119,13 +1119,13 @@ SecurityAuditResourceIDAccess(
* Disallowed resource accesses are audited.
*/
-static pointer
+static void *
SecurityCheckResourceIDAccess(
ClientPtr client,
XID id,
RESTYPE rtype,
Mask access_mode,
- pointer rval)
+ void * rval)
{
int cid = CLIENT_ID(id);
int reqtype = ((xReq *)client->requestBuffer)->reqType;
@@ -1288,8 +1288,8 @@ SecurityCheckResourceIDAccess(
static void
SecurityClientStateCallback(
CallbackListPtr *pcbl,
- pointer nulldata,
- pointer calldata)
+ void * nulldata,
+ void * calldata)
{
NewClientInfoRec *pci = (NewClientInfoRec *)calldata;
ClientPtr client = pci->client;
@@ -1445,7 +1445,7 @@ SecurityCensorImage(client, pVisibleRegion, widthBytesLine, pDraw, x, y, w, h,
pPix = GetScratchPixmapHeader(pDraw->pScreen, w, h,
depth, bitsPerPixel,
- widthBytesLine, (pointer)pBuf);
+ widthBytesLine, (void *)pBuf);
if (!pPix)
{
failed = TRUE;
diff --git a/nx-X11/programs/Xserver/Xext/shape.c b/nx-X11/programs/Xserver/Xext/shape.c
index 86b4b5603..02182398a 100644
--- a/nx-X11/programs/Xserver/Xext/shape.c
+++ b/nx-X11/programs/Xserver/Xext/shape.c
@@ -58,11 +58,11 @@ typedef RegionPtr (*CreateDftPtr)(
);
static int ShapeFreeClient(
- pointer /* data */,
+ void * /* data */,
XID /* id */
);
static int ShapeFreeEvents(
- pointer /* data */,
+ void * /* data */,
XID /* id */
);
static void ShapeResetProc(
@@ -774,7 +774,7 @@ ProcShapeQueryExtents (client)
/*ARGSUSED*/
static int
ShapeFreeClient (data, id)
- pointer data;
+ void *data;
XID id;
{
ShapeEventPtr pShapeEvent;
@@ -796,14 +796,14 @@ ShapeFreeClient (data, id)
*pHead = pShapeEvent->next;
}
}
- xfree ((pointer) pShapeEvent);
+ xfree ((void *) pShapeEvent);
return 1;
}
/*ARGSUSED*/
static int
ShapeFreeEvents (data, id)
- pointer data;
+ void *data;
XID id;
{
ShapeEventPtr *pHead, pCur, pNext;
@@ -812,9 +812,9 @@ ShapeFreeEvents (data, id)
for (pCur = *pHead; pCur; pCur = pNext) {
pNext = pCur->next;
FreeResource (pCur->clientResource, ClientType);
- xfree ((pointer) pCur);
+ xfree ((void *) pCur);
}
- xfree ((pointer) pHead);
+ xfree ((void *) pHead);
return 1;
}
@@ -861,7 +861,7 @@ ProcShapeSelectInput (client)
*/
clientResource = FakeClientID (client->index);
pNewShapeEvent->clientResource = clientResource;
- if (!AddResource (clientResource, ClientType, (pointer)pNewShapeEvent))
+ if (!AddResource (clientResource, ClientType, (void *)pNewShapeEvent))
return BadAlloc;
/*
* create a resource to contain a pointer to the list
@@ -873,7 +873,7 @@ ProcShapeSelectInput (client)
{
pHead = (ShapeEventPtr *) xalloc (sizeof (ShapeEventPtr));
if (!pHead ||
- !AddResource (pWin->drawable.id, EventType, (pointer)pHead))
+ !AddResource (pWin->drawable.id, EventType, (void *)pHead))
{
FreeResource (clientResource, RT_NONE);
return BadAlloc;
diff --git a/nx-X11/programs/Xserver/Xext/shm.c b/nx-X11/programs/Xserver/Xext/shm.c
index dfb85c3ec..d500e551c 100644
--- a/nx-X11/programs/Xserver/Xext/shm.c
+++ b/nx-X11/programs/Xserver/Xext/shm.c
@@ -86,7 +86,7 @@ static void miShmPutImage(XSHM_PUT_IMAGE_ARGS);
static void fbShmPutImage(XSHM_PUT_IMAGE_ARGS);
static PixmapPtr fbShmCreatePixmap(XSHM_CREATE_PIXMAP_ARGS);
static int ShmDetachSegment(
- pointer /* value */,
+ void * /* value */,
XID /* shmseg */
);
static void ShmResetProc(
@@ -309,7 +309,7 @@ ShmDestroyPixmap (PixmapPtr pPixmap)
#else
char *base = (char *) pPixmap->devPrivate.ptr;
- if (base != (pointer) (pPixmap + 1))
+ if (base != (void *) (pPixmap + 1))
{
for (shmdesc = Shmsegs; shmdesc; shmdesc = shmdesc->next)
{
@@ -321,7 +321,7 @@ ShmDestroyPixmap (PixmapPtr pPixmap)
shmdesc = 0;
#endif
if (shmdesc)
- ShmDetachSegment ((pointer) shmdesc, pPixmap->drawable.id);
+ ShmDetachSegment ((void *) shmdesc, pPixmap->drawable.id);
}
pScreen->DestroyPixmap = destroyPixmap[pScreen->myNum];
@@ -465,7 +465,7 @@ ProcShmAttach(client)
shmdesc->next = Shmsegs;
Shmsegs = shmdesc;
}
- if (!AddResource(stuff->shmseg, ShmSegType, (pointer)shmdesc))
+ if (!AddResource(stuff->shmseg, ShmSegType, (void *)shmdesc))
return BadAlloc;
return(client->noClientException);
}
@@ -473,7 +473,7 @@ ProcShmAttach(client)
/*ARGSUSED*/
static int
ShmDetachSegment(value, shmseg)
- pointer value; /* must conform to DeleteType */
+ void * value; /* must conform to DeleteType */
XID shmseg;
{
ShmDescPtr shmdesc = (ShmDescPtr)value;
@@ -548,7 +548,7 @@ fbShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data)
PixmapPtr pPixmap;
pPixmap = GetScratchPixmapHeader(dst->pScreen, w, h, depth,
- BitsPerPixel(depth), PixmapBytePad(w, depth), (pointer)data);
+ BitsPerPixel(depth), PixmapBytePad(w, depth), (void *)data);
if (!pPixmap)
return;
if (format == XYBitmap)
@@ -794,12 +794,12 @@ CreatePmap:
if (pMap) {
#ifdef PIXPRIV
- pMap->devPrivates[shmPixmapPrivate].ptr = (pointer) shmdesc;
+ pMap->devPrivates[shmPixmapPrivate].ptr = (void *) shmdesc;
#endif
shmdesc->refcnt++;
pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
pMap->drawable.id = newPix->info[j].id;
- if (!AddResource(newPix->info[j].id, RT_PIXMAP, (pointer)pMap)) {
+ if (!AddResource(newPix->info[j].id, RT_PIXMAP, (void *)pMap)) {
(*pScreen->DestroyPixmap)(pMap);
result = BadAlloc;
break;
@@ -1062,7 +1062,7 @@ fbShmCreatePixmap (pScreen, width, height, depth, addr)
return NullPixmap;
if (!(*pScreen->ModifyPixmapHeader)(pPixmap, width, height, depth,
- BitsPerPixel(depth), PixmapBytePad(width, depth), (pointer)addr)) {
+ BitsPerPixel(depth), PixmapBytePad(width, depth), (void *)addr)) {
(*pScreen->DestroyPixmap)(pPixmap);
return NullPixmap;
}
@@ -1129,12 +1129,12 @@ CreatePmap:
if (pMap)
{
#ifdef PIXPRIV
- pMap->devPrivates[shmPixmapPrivate].ptr = (pointer) shmdesc;
+ pMap->devPrivates[shmPixmapPrivate].ptr = (void *) shmdesc;
#endif
shmdesc->refcnt++;
pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
pMap->drawable.id = stuff->pid;
- if (AddResource(stuff->pid, RT_PIXMAP, (pointer)pMap))
+ if (AddResource(stuff->pid, RT_PIXMAP, (void *)pMap))
{
return(client->noClientException);
}
diff --git a/nx-X11/programs/Xserver/Xext/sleepuntil.c b/nx-X11/programs/Xserver/Xext/sleepuntil.c
index 8e0008cab..da93806f5 100644
--- a/nx-X11/programs/Xserver/Xext/sleepuntil.c
+++ b/nx-X11/programs/Xserver/Xext/sleepuntil.c
@@ -49,10 +49,10 @@ typedef struct _Sertafied {
XID id;
void (*notifyFunc)(
ClientPtr /* client */,
- pointer /* closure */
+ void * /* closure */
);
- pointer closure;
+ void *closure;
} SertafiedRec, *SertafiedPtr;
static SertafiedPtr pPending;
@@ -62,21 +62,21 @@ static int SertafiedGeneration;
static void ClientAwaken(
ClientPtr /* client */,
- pointer /* closure */
+ void * /* closure */
);
static int SertafiedDelete(
- pointer /* value */,
+ void * /* value */,
XID /* id */
);
static void SertafiedBlockHandler(
- pointer /* data */,
+ void * /* data */,
OSTimePtr /* wt */,
- pointer /* LastSelectMask */
+ void * /* LastSelectMask */
);
static void SertafiedWakeupHandler(
- pointer /* data */,
+ void * /* data */,
int /* i */,
- pointer /* LastSelectMask */
+ void * /* LastSelectMask */
);
int
@@ -85,8 +85,8 @@ ClientSleepUntil (client, revive, notifyFunc, closure)
TimeStamp *revive;
void (*notifyFunc)(
ClientPtr /* client */,
- pointer /* closure */);
- pointer closure;
+ void * /* closure */);
+ void *closure;
{
SertafiedPtr pRequest, pReq, pPrev;
@@ -109,7 +109,7 @@ ClientSleepUntil (client, revive, notifyFunc, closure)
{
if (!RegisterBlockAndWakeupHandlers (SertafiedBlockHandler,
SertafiedWakeupHandler,
- (pointer) 0))
+ (void *) 0))
{
xfree (pRequest);
return FALSE;
@@ -117,7 +117,7 @@ ClientSleepUntil (client, revive, notifyFunc, closure)
BlockHandlerRegistered = TRUE;
}
pRequest->notifyFunc = 0;
- if (!AddResource (pRequest->id, SertafiedResType, (pointer) pRequest))
+ if (!AddResource (pRequest->id, SertafiedResType, (void *) pRequest))
return FALSE;
if (!notifyFunc)
notifyFunc = ClientAwaken;
@@ -142,7 +142,7 @@ ClientSleepUntil (client, revive, notifyFunc, closure)
static void
ClientAwaken (client, closure)
ClientPtr client;
- pointer closure;
+ void *closure;
{
if (!client->clientGone)
AttendClient (client);
@@ -151,7 +151,7 @@ ClientAwaken (client, closure)
static int
SertafiedDelete (value, id)
- pointer value;
+ void * value;
XID id;
{
SertafiedPtr pRequest = (SertafiedPtr)value;
@@ -175,9 +175,9 @@ SertafiedDelete (value, id)
static void
SertafiedBlockHandler (data, wt, LastSelectMask)
- pointer data; /* unused */
+ void *data; /* unused */
OSTimePtr wt; /* wait time */
- pointer LastSelectMask;
+ void *LastSelectMask;
{
SertafiedPtr pReq, pNext;
unsigned long delay;
@@ -211,9 +211,9 @@ SertafiedBlockHandler (data, wt, LastSelectMask)
static void
SertafiedWakeupHandler (data, i, LastSelectMask)
- pointer data;
+ void * data;
int i;
- pointer LastSelectMask;
+ void * LastSelectMask;
{
SertafiedPtr pReq, pNext;
TimeStamp now;
@@ -233,7 +233,7 @@ SertafiedWakeupHandler (data, i, LastSelectMask)
{
RemoveBlockAndWakeupHandlers (SertafiedBlockHandler,
SertafiedWakeupHandler,
- (pointer) 0);
+ (void *) 0);
BlockHandlerRegistered = FALSE;
}
}
diff --git a/nx-X11/programs/Xserver/Xext/sleepuntil.h b/nx-X11/programs/Xserver/Xext/sleepuntil.h
index 0b99148a4..e828a7c8f 100644
--- a/nx-X11/programs/Xserver/Xext/sleepuntil.h
+++ b/nx-X11/programs/Xserver/Xext/sleepuntil.h
@@ -39,9 +39,9 @@ extern int ClientSleepUntil(
TimeStamp *revive,
void (*notifyFunc)(
ClientPtr /* client */,
- pointer /* closure */
+ void * /* closure */
),
- pointer Closure
+ void * Closure
);
#endif
diff --git a/nx-X11/programs/Xserver/Xext/sync.c b/nx-X11/programs/Xserver/Xext/sync.c
index e5b8ef946..006cefa86 100644
--- a/nx-X11/programs/Xserver/Xext/sync.c
+++ b/nx-X11/programs/Xserver/Xext/sync.c
@@ -103,40 +103,40 @@ static SyncCounter **SysCounterList = NULL;
static int
FreeAlarm(
- pointer /* addr */,
+ void * /* addr */,
XID /* id */
);
static int
FreeAlarmClient(
- pointer /* value */,
+ void * /* value */,
XID /* id */
);
static int
FreeAwait(
- pointer /* addr */,
+ void * /* addr */,
XID /* id */
);
static void
ServertimeBracketValues(
- pointer /* pCounter */,
+ void * /* pCounter */,
CARD64 * /* pbracket_less */,
CARD64 * /* pbracket_greater */
);
static void
ServertimeQueryValue(
- pointer /* pCounter */,
+ void * /* pCounter */,
CARD64 * /* pValue_return */
);
static void
ServertimeWakeupHandler(
- pointer /* env */,
+ void * /* env */,
int /* rc */,
- pointer /* LastSelectMask */
+ void * /* LastSelectMask */
);
static int
@@ -161,9 +161,9 @@ SCounterNotifyEvent(
static void
ServertimeBlockHandler(
- pointer /* env */,
+ void * /* env */,
struct timeval ** /* wt */,
- pointer /* LastSelectMask */
+ void * /* LastSelectMask */
);
static int
@@ -449,7 +449,7 @@ SyncInitTrigger(client, pTrigger, counter, changes)
if (IsSystemCounter(pCounter))
{
- (*pCounter->pSysCounterInfo->QueryValue) ((pointer) pCounter,
+ (*pCounter->pSysCounterInfo->QueryValue) ((void *) pCounter,
&pCounter->value);
}
@@ -1016,9 +1016,9 @@ SyncCreateCounter(client, id, initialvalue)
if (!(pCounter = (SyncCounter *) xalloc(sizeof(SyncCounter))))
return (SyncCounter *)NULL;
- if (!AddResource(id, RTCounter, (pointer) pCounter))
+ if (!AddResource(id, RTCounter, (void *) pCounter))
{
- xfree((pointer) pCounter);
+ xfree((void *) pCounter);
return (SyncCounter *)NULL;
}
@@ -1032,7 +1032,7 @@ SyncCreateCounter(client, id, initialvalue)
}
static int FreeCounter(
- pointer /*env*/,
+ void * /*env*/,
XID /*id*/
);
@@ -1040,7 +1040,7 @@ static int FreeCounter(
* ***** System Counter utilities
*/
-pointer
+void *
SyncCreateSystemCounter(name, initial, resolution, counterType,
QueryValue, BracketValues)
char *name;
@@ -1048,10 +1048,10 @@ SyncCreateSystemCounter(name, initial, resolution, counterType,
CARD64 resolution;
SyncCounterType counterType;
void (*QueryValue) (
- pointer /* pCounter */,
+ void * /* pCounter */,
CARD64 * /* pValue_return */);
void (*BracketValues) (
- pointer /* pCounter */,
+ void * /* pCounter */,
CARD64 * /* pbracket_less */,
CARD64 * /* pbracket_greater */);
{
@@ -1060,7 +1060,7 @@ SyncCreateSystemCounter(name, initial, resolution, counterType,
SysCounterList = (SyncCounter **)xrealloc(SysCounterList,
(SyncNumSystemCounters+1)*sizeof(SyncCounter *));
if (!SysCounterList)
- return (pointer)NULL;
+ return (void *)NULL;
/* this function may be called before SYNC has been initialized, so we
* have to make sure RTCounter is created.
@@ -1070,7 +1070,7 @@ SyncCreateSystemCounter(name, initial, resolution, counterType,
RTCounter = CreateNewResourceType(FreeCounter);
if (RTCounter == 0)
{
- return (pointer)NULL;
+ return (void *)NULL;
}
}
@@ -1084,7 +1084,7 @@ SyncCreateSystemCounter(name, initial, resolution, counterType,
if (!psci)
{
FreeResource(pCounter->id, RT_NONE);
- return (pointer) pCounter;
+ return (void *) pCounter;
}
pCounter->pSysCounterInfo = psci;
psci->name = name;
@@ -1096,12 +1096,12 @@ SyncCreateSystemCounter(name, initial, resolution, counterType,
XSyncMinValue(&psci->bracket_less);
SysCounterList[SyncNumSystemCounters++] = pCounter;
}
- return (pointer) pCounter;
+ return (void *) pCounter;
}
void
SyncDestroySystemCounter(pSysCounter)
- pointer pSysCounter;
+ void * pSysCounter;
{
SyncCounter *pCounter = (SyncCounter *)pSysCounter;
FreeResource(pCounter->id, RT_NONE);
@@ -1186,7 +1186,7 @@ SyncComputeBracketValues(pCounter, startOver)
if (pnewgtval || pnewltval)
{
- (*psci->BracketValues)((pointer)pCounter, pnewltval, pnewgtval);
+ (*psci->BracketValues)((void *)pCounter, pnewltval, pnewgtval);
}
}
@@ -1197,7 +1197,7 @@ SyncComputeBracketValues(pCounter, startOver)
/* ARGSUSED */
static int
FreeAlarm(addr, id)
- pointer addr;
+ void *addr;
XID id;
{
SyncAlarm *pAlarm = (SyncAlarm *) addr;
@@ -1224,7 +1224,7 @@ FreeAlarm(addr, id)
/* ARGSUSED */
static int
FreeCounter(env, id)
- pointer env;
+ void *env;
XID id;
{
SyncCounter *pCounter = (SyncCounter *) env;
@@ -1276,7 +1276,7 @@ FreeCounter(env, id)
/* ARGSUSED */
static int
FreeAwait(addr, id)
- pointer addr;
+ void *addr;
XID id;
{
SyncAwaitUnion *pAwaitUnion = (SyncAwaitUnion *) addr;
@@ -1304,7 +1304,7 @@ FreeAwait(addr, id)
/* loosely based on dix/events.c/OtherClientGone */
static int
FreeAlarmClient(value, id)
- pointer value; /* must conform to DeleteType */
+ void * value; /* must conform to DeleteType */
XID id;
{
SyncAlarm *pAlarm = (SyncAlarm *)value;
@@ -1778,7 +1778,7 @@ ProcSyncQueryCounter(client)
if (IsSystemCounter(pCounter))
{
- (*pCounter->pSysCounterInfo->QueryValue) ((pointer) pCounter,
+ (*pCounter->pSysCounterInfo->QueryValue) ((void *) pCounter,
&pCounter->value);
}
@@ -2406,7 +2406,7 @@ SyncExtensionInit(INITARGS)
-static pointer ServertimeCounter;
+static void * ServertimeCounter;
static XSyncValue Now;
static XSyncValue *pnext_time;
@@ -2424,9 +2424,9 @@ static XSyncValue *pnext_time;
*/
/*ARGSUSED*/
static void ServertimeBlockHandler(env, wt, LastSelectMask)
-pointer env;
+void * env;
struct timeval **wt;
-pointer LastSelectMask;
+void * LastSelectMask;
{
XSyncValue delay;
unsigned long timeout;
@@ -2455,9 +2455,9 @@ pointer LastSelectMask;
*/
/*ARGSUSED*/
static void ServertimeWakeupHandler(env, rc, LastSelectMask)
-pointer env;
+void * env;
int rc;
-pointer LastSelectMask;
+void * LastSelectMask;
{
if (pnext_time)
{
@@ -2472,7 +2472,7 @@ pointer LastSelectMask;
static void
ServertimeQueryValue(pCounter, pValue_return)
- pointer pCounter;
+ void * pCounter;
CARD64 *pValue_return;
{
GetTime();
@@ -2481,7 +2481,7 @@ ServertimeQueryValue(pCounter, pValue_return)
static void
ServertimeBracketValues(pCounter, pbracket_less, pbracket_greater)
- pointer pCounter;
+ void * pCounter;
CARD64 *pbracket_less;
CARD64 *pbracket_greater;
{
diff --git a/nx-X11/programs/Xserver/Xext/vidmodeproc.h b/nx-X11/programs/Xserver/Xext/vidmodeproc.h
index 918d1e4df..1f7c6cd04 100644
--- a/nx-X11/programs/Xserver/Xext/vidmodeproc.h
+++ b/nx-X11/programs/Xserver/Xext/vidmodeproc.h
@@ -36,7 +36,7 @@ typedef enum {
} VidModeSelectMonitor;
typedef union {
- pointer ptr;
+ void * ptr;
int i;
float f;
} vidMonitorValue;
@@ -44,31 +44,31 @@ typedef union {
void XFree86VidModeExtensionInit(void);
Bool VidModeAvailable(int scrnIndex);
-Bool VidModeGetCurrentModeline(int scrnIndex, pointer *mode, int *dotClock);
-Bool VidModeGetFirstModeline(int scrnIndex, pointer *mode, int *dotClock);
-Bool VidModeGetNextModeline(int scrnIndex, pointer *mode, int *dotClock);
-Bool VidModeDeleteModeline(int scrnIndex, pointer mode);
+Bool VidModeGetCurrentModeline(int scrnIndex, void **mode, int *dotClock);
+Bool VidModeGetFirstModeline(int scrnIndex, void **mode, int *dotClock);
+Bool VidModeGetNextModeline(int scrnIndex, void **mode, int *dotClock);
+Bool VidModeDeleteModeline(int scrnIndex, void * mode);
Bool VidModeZoomViewport(int scrnIndex, int zoom);
Bool VidModeGetViewPort(int scrnIndex, int *x, int *y);
Bool VidModeSetViewPort(int scrnIndex, int x, int y);
-Bool VidModeSwitchMode(int scrnIndex, pointer mode);
+Bool VidModeSwitchMode(int scrnIndex, void * mode);
Bool VidModeLockZoom(int scrnIndex, Bool lock);
-Bool VidModeGetMonitor(int scrnIndex, pointer *monitor);
+Bool VidModeGetMonitor(int scrnIndex, void **monitor);
int VidModeGetNumOfClocks(int scrnIndex, Bool *progClock);
Bool VidModeGetClocks(int scrnIndex, int *Clocks);
-ModeStatus VidModeCheckModeForMonitor(int scrnIndex, pointer mode);
-ModeStatus VidModeCheckModeForDriver(int scrnIndex, pointer mode);
-void VidModeSetCrtcForMode(int scrnIndex, pointer mode);
-Bool VidModeAddModeline(int scrnIndex, pointer mode);
+ModeStatus VidModeCheckModeForMonitor(int scrnIndex, void * mode);
+ModeStatus VidModeCheckModeForDriver(int scrnIndex, void * mode);
+void VidModeSetCrtcForMode(int scrnIndex, void * mode);
+Bool VidModeAddModeline(int scrnIndex, void * mode);
int VidModeGetDotClock(int scrnIndex, int Clock);
int VidModeGetNumOfModes(int scrnIndex);
Bool VidModeSetGamma(int scrnIndex, float red, float green, float blue);
Bool VidModeGetGamma(int scrnIndex, float *red, float *green, float *blue);
-pointer VidModeCreateMode(void);
-void VidModeCopyMode(pointer modefrom, pointer modeto);
-int VidModeGetModeValue(pointer mode, int valtyp);
-void VidModeSetModeValue(pointer mode, int valtyp, int val);
-vidMonitorValue VidModeGetMonitorValue(pointer monitor, int valtyp, int indx);
+void * VidModeCreateMode(void);
+void VidModeCopyMode(void * modefrom, void * modeto);
+int VidModeGetModeValue(void * mode, int valtyp);
+void VidModeSetModeValue(void * mode, int valtyp, int val);
+vidMonitorValue VidModeGetMonitorValue(void * monitor, int valtyp, int indx);
Bool VidModeSetGammaRamp(int, int, CARD16 *, CARD16 *, CARD16 *);
Bool VidModeGetGammaRamp(int, int, CARD16 *, CARD16 *, CARD16 *);
int VidModeGetGammaRampSize(int scrnIndex);
diff --git a/nx-X11/programs/Xserver/Xext/xevie.c b/nx-X11/programs/Xserver/Xext/xevie.c
index 3ec6cc4f0..354be121f 100644
--- a/nx-X11/programs/Xserver/Xext/xevie.c
+++ b/nx-X11/programs/Xserver/Xext/xevie.c
@@ -114,15 +114,15 @@ static int ErrorBase;
static Bool XevieStart(void);
static void XevieEnd(int clientIndex);
-static void XevieClientStateCallback(CallbackListPtr *pcbl, pointer nulldata,
- pointer calldata);
+static void XevieClientStateCallback(CallbackListPtr *pcbl, void * nulldata,
+ void * calldata);
static void XevieServerGrabStateCallback(CallbackListPtr *pcbl,
- pointer nulldata,
- pointer calldata);
+ void * nulldata,
+ void * calldata);
-static Bool XevieAdd(DeviceIntPtr device, pointer data);
+static Bool XevieAdd(DeviceIntPtr device, void * data);
static void XevieWrap(DeviceIntPtr device, ProcessInputProc proc);
-static Bool XevieRemove(DeviceIntPtr device, pointer data);
+static Bool XevieRemove(DeviceIntPtr device, void * data);
static void doSendEvent(xEvent *xE, DeviceIntPtr device);
static void XeviePointerProcessInputProc(xEvent *xE, DeviceIntPtr dev,
int count);
@@ -570,8 +570,8 @@ XevieEnd(int clientIndex)
}
static void
-XevieClientStateCallback(CallbackListPtr *pcbl, pointer nulldata,
- pointer calldata)
+XevieClientStateCallback(CallbackListPtr *pcbl, void * nulldata,
+ void * calldata)
{
NewClientInfoRec *pci = (NewClientInfoRec *)calldata;
ClientPtr client = pci->client;
@@ -581,8 +581,8 @@ XevieClientStateCallback(CallbackListPtr *pcbl, pointer nulldata,
}
static void
-XevieServerGrabStateCallback(CallbackListPtr *pcbl, pointer nulldata,
- pointer calldata)
+XevieServerGrabStateCallback(CallbackListPtr *pcbl, void * nulldata,
+ void * calldata)
{
ServerGrabInfoRec *grbinfo = (ServerGrabInfoRec *)calldata;
if (grbinfo->grabstate == SERVER_GRABBED)
@@ -599,7 +599,7 @@ XevieServerGrabStateCallback(CallbackListPtr *pcbl, pointer nulldata,
device->unwrapProc = proc;
static void
-xevieUnwrapProc(DeviceIntPtr device, DeviceHandleProc proc, pointer data)
+xevieUnwrapProc(DeviceIntPtr device, DeviceHandleProc proc, void * data)
{
xevieDeviceInfoPtr xeviep = XEVIEINFO(device);
ProcessInputProc tmp = device->public.processInputProc;
@@ -643,7 +643,7 @@ XevieAdd(DeviceIntPtr device, void* data)
}
static Bool
-XevieRemove(DeviceIntPtr device,pointer data)
+XevieRemove(DeviceIntPtr device,void * data)
{
xevieDeviceInfoPtr xeviep = XEVIEINFO(device);
@@ -697,7 +697,7 @@ doSendEvent(xEvent *xE, DeviceIntPtr dev)
dev->key->modifierMap[xE->u.u.detail] = 0;
if(dev->key->xkbInfo->repeatKey != 0 && xE->u.u.type != KeyPress)
- XkbLastRepeatEvent= (pointer)xE;
+ XkbLastRepeatEvent= (void *)xE;
UNWRAP_INPUTPROC(dev,xeviep);
dev->public.processInputProc(xE,dev,1);
COND_WRAP_INPUTPROC(dev,xeviep,tmp);
diff --git a/nx-X11/programs/Xserver/Xext/xf86dga2.c b/nx-X11/programs/Xserver/Xext/xf86dga2.c
index a5cab0f11..490554d9a 100644
--- a/nx-X11/programs/Xserver/Xext/xf86dga2.c
+++ b/nx-X11/programs/Xserver/Xext/xf86dga2.c
@@ -59,7 +59,7 @@ static DISPATCH_PROC(ProcXDGACreateColormap);
static void XDGAResetProc(ExtensionEntry *extEntry);
-static void DGAClientStateChange (CallbackListPtr*, pointer, pointer);
+static void DGAClientStateChange (CallbackListPtr*, void *, void *);
static ClientPtr DGAClients[MAXSCREENS];
@@ -291,8 +291,8 @@ ProcXDGAQueryModes(ClientPtr client)
static void
DGAClientStateChange (
CallbackListPtr* pcbl,
- pointer nulldata,
- pointer calldata
+ void * nulldata,
+ void * calldata
){
NewClientInfoRec* pci = (NewClientInfoRec*) calldata;
ClientPtr client = NULL;
@@ -370,7 +370,7 @@ ProcXDGASetMode(ClientPtr client)
DGAClients[stuff->screen] = client;
if(pPix) {
- if(AddResource(stuff->pid, RT_PIXMAP, (pointer)(pPix))) {
+ if(AddResource(stuff->pid, RT_PIXMAP, (void *)(pPix))) {
pPix->drawable.id = (int)stuff->pid;
rep.flags = DGA_PIXMAP_AVAILABLE;
}
diff --git a/nx-X11/programs/Xserver/Xext/xf86misc.c b/nx-X11/programs/Xserver/Xext/xf86misc.c
index a5dc2e212..6de794e1f 100644
--- a/nx-X11/programs/Xserver/Xext/xf86misc.c
+++ b/nx-X11/programs/Xserver/Xext/xf86misc.c
@@ -265,7 +265,7 @@ ProcXF86MiscGetMouseSettings(client)
{
xXF86MiscGetMouseSettingsReply rep;
char *devname;
- pointer mouse;
+ void * mouse;
register int n;
DEBUG_P("XF86MiscGetMouseSettings");
@@ -316,7 +316,7 @@ ProcXF86MiscGetKbdSettings(client)
register ClientPtr client;
{
xXF86MiscGetKbdSettingsReply rep;
- pointer kbd;
+ void * kbd;
register int n;
DEBUG_P("XF86MiscGetKbdSettings");
@@ -348,7 +348,7 @@ ProcXF86MiscSetMouseSettings(client)
register ClientPtr client;
{
MiscExtReturn ret;
- pointer mouse;
+ void * mouse;
char *devname = NULL;
int major, minor;
@@ -369,7 +369,7 @@ ProcXF86MiscSetMouseSettings(client)
(int)stuff->resolution, (unsigned long)stuff->flags);
}
- if ((mouse = MiscExtCreateStruct(MISC_POINTER)) == (pointer) 0)
+ if ((mouse = MiscExtCreateStruct(MISC_POINTER)) == (void *) 0)
return BadAlloc;
MiscExtSetMouseValue(mouse, MISC_MSE_PROTO, stuff->mousetype);
@@ -425,7 +425,7 @@ ProcXF86MiscSetKbdSettings(client)
register ClientPtr client;
{
MiscExtReturn ret;
- pointer kbd;
+ void * kbd;
REQUEST(xXF86MiscSetKbdSettingsReq);
DEBUG_P("XF86MiscSetKbdSettings");
@@ -437,7 +437,7 @@ ProcXF86MiscSetKbdSettings(client)
(int)stuff->kbdtype, (int)stuff->rate,
(int)stuff->delay, stuff->servnumlock);
- if ((kbd = MiscExtCreateStruct(MISC_KEYBOARD)) == (pointer) 0)
+ if ((kbd = MiscExtCreateStruct(MISC_KEYBOARD)) == (void *) 0)
return BadAlloc;
MiscExtSetKbdValue(kbd, MISC_KBD_TYPE, stuff->kbdtype);
diff --git a/nx-X11/programs/Xserver/Xext/xf86miscproc.h b/nx-X11/programs/Xserver/Xext/xf86miscproc.h
index 87a251767..5eefa02a3 100644
--- a/nx-X11/programs/Xserver/Xext/xf86miscproc.h
+++ b/nx-X11/programs/Xserver/Xext/xf86miscproc.h
@@ -50,17 +50,17 @@ typedef enum {
void XFree86MiscExtensionInit(void);
-Bool MiscExtGetMouseSettings(pointer *mouse, char **devname);
-int MiscExtGetMouseValue(pointer mouse, MiscExtMseValType valtype);
-Bool MiscExtSetMouseValue(pointer mouse, MiscExtMseValType valtype, int value);
-Bool MiscExtGetKbdSettings(pointer *kbd);
-int MiscExtGetKbdValue(pointer kbd, MiscExtKbdValType valtype);
-Bool MiscExtSetKbdValue(pointer kbd, MiscExtKbdValType valtype, int value);
+Bool MiscExtGetMouseSettings(void **mouse, char **devname);
+int MiscExtGetMouseValue(void * mouse, MiscExtMseValType valtype);
+Bool MiscExtSetMouseValue(void * mouse, MiscExtMseValType valtype, int value);
+Bool MiscExtGetKbdSettings(void **kbd);
+int MiscExtGetKbdValue(void * kbd, MiscExtKbdValType valtype);
+Bool MiscExtSetKbdValue(void * kbd, MiscExtKbdValType valtype, int value);
int MiscExtSetGrabKeysState(ClientPtr client, int enable);
-pointer MiscExtCreateStruct(MiscExtStructType mse_or_kbd);
-void MiscExtDestroyStruct(pointer structure, MiscExtStructType mse_or_kbd);
-MiscExtReturn MiscExtApply(pointer structure, MiscExtStructType mse_or_kbd);
-Bool MiscExtSetMouseDevice(pointer mouse, char* device);
+void * MiscExtCreateStruct(MiscExtStructType mse_or_kbd);
+void MiscExtDestroyStruct(void * structure, MiscExtStructType mse_or_kbd);
+MiscExtReturn MiscExtApply(void * structure, MiscExtStructType mse_or_kbd);
+Bool MiscExtSetMouseDevice(void * mouse, char* device);
Bool MiscExtGetFilePaths(const char **configfile, const char **modulepath,
const char **logfile);
int MiscExtPassMessage(int scrn, const char *msgtype, const char *msgval,
diff --git a/nx-X11/programs/Xserver/Xext/xf86vmode.c b/nx-X11/programs/Xserver/Xext/xf86vmode.c
index fa49fcd75..979f55c00 100644
--- a/nx-X11/programs/Xserver/Xext/xf86vmode.c
+++ b/nx-X11/programs/Xserver/Xext/xf86vmode.c
@@ -155,7 +155,7 @@ typedef struct _XF86VidModeScreenPrivate {
static int ScreenPrivateIndex;
#define GetScreenPrivate(s) ((ScreenSaverScreenPrivatePtr)(s)->devPrivates[ScreenPrivateIndex].ptr)
-#define SetScreenPrivate(s,v) ((s)->devPrivates[ScreenPrivateIndex].ptr = (pointer) v);
+#define SetScreenPrivate(s,v) ((s)->devPrivates[ScreenPrivateIndex].ptr = (void *) v);
#define SetupScreen(s) ScreenSaverScreenPrivatePtr pPriv = GetScreenPrivate(s)
#define New(t) (xalloc (sizeof (t)))
@@ -338,7 +338,7 @@ setEventMask (ScreenPtr pScreen, ClientPtr client, unsigned long mask)
}
static int
-XF86VidModeFreeEvents(pointer value, XID id)
+XF86VidModeFreeEvents(void * value, XID id)
{
XF86VidModeEventPtr pOld = (XF86VidModeEventPtr)value;
ScreenPtr pScreen = pOld->screen;
@@ -437,7 +437,7 @@ ProcXF86VidModeGetModeLine(ClientPtr client)
REQUEST(xXF86VidModeGetModeLineReq);
xXF86VidModeGetModeLineReply rep;
xXF86OldVidModeGetModeLineReply oldrep;
- pointer mode;
+ void * mode;
register int n;
int dotClock;
int ver;
@@ -539,7 +539,7 @@ ProcXF86VidModeGetAllModeLines(ClientPtr client)
xXF86VidModeGetAllModeLinesReply rep;
xXF86VidModeModeInfo mdinf;
xXF86OldVidModeModeInfo oldmdinf;
- pointer mode;
+ void * mode;
int modecount, dotClock;
register int n;
int ver;
@@ -645,7 +645,7 @@ ProcXF86VidModeAddModeLine(ClientPtr client)
xXF86OldVidModeAddModeLineReq *oldstuff =
(xXF86OldVidModeAddModeLineReq *)client->requestBuffer;
xXF86VidModeAddModeLineReq newstuff;
- pointer mode;
+ void * mode;
int len;
int dotClock;
int ver;
@@ -805,7 +805,7 @@ ProcXF86VidModeDeleteModeLine(ClientPtr client)
xXF86OldVidModeDeleteModeLineReq *oldstuff =
(xXF86OldVidModeDeleteModeLineReq *)client->requestBuffer;
xXF86VidModeDeleteModeLineReq newstuff;
- pointer mode;
+ void * mode;
int len, dotClock;
int ver;
@@ -922,7 +922,7 @@ ProcXF86VidModeModModeLine(ClientPtr client)
xXF86OldVidModeModModeLineReq *oldstuff =
(xXF86OldVidModeModModeLineReq *)client->requestBuffer;
xXF86VidModeModModeLineReq newstuff;
- pointer mode, modetmp;
+ void * mode, modetmp;
int len, dotClock;
int ver;
@@ -1047,7 +1047,7 @@ ProcXF86VidModeValidateModeLine(ClientPtr client)
(xXF86OldVidModeValidateModeLineReq *)client->requestBuffer;
xXF86VidModeValidateModeLineReq newstuff;
xXF86VidModeValidateModeLineReply rep;
- pointer mode, modetmp = NULL;
+ void * mode, modetmp = NULL;
int len, status, dotClock;
int ver;
@@ -1181,7 +1181,7 @@ ProcXF86VidModeSwitchToMode(ClientPtr client)
xXF86OldVidModeSwitchToModeReq *oldstuff =
(xXF86OldVidModeSwitchToModeReq *)client->requestBuffer;
xXF86VidModeSwitchToModeReq newstuff;
- pointer mode;
+ void * mode;
int len, dotClock;
int ver;
@@ -1297,7 +1297,7 @@ ProcXF86VidModeGetMonitor(ClientPtr client)
register int n;
CARD32 *hsyncdata, *vsyncdata;
int i, nHsync, nVrefresh;
- pointer monitor;
+ void * monitor;
DEBUG_P("XF86VidModeGetMonitor");
diff --git a/nx-X11/programs/Xserver/Xext/xres.c b/nx-X11/programs/Xserver/Xext/xres.c
index d13d3368b..dc4018dd7 100644
--- a/nx-X11/programs/Xserver/Xext/xres.c
+++ b/nx-X11/programs/Xserver/Xext/xres.c
@@ -106,7 +106,7 @@ ProcXResQueryClients (ClientPtr client)
static void
-ResFindAllRes (pointer value, XID id, RESTYPE type, pointer cdata)
+ResFindAllRes (void * value, XID id, RESTYPE type, void * cdata)
{
int *counts = (int *)cdata;
@@ -186,7 +186,7 @@ ProcXResQueryClientResources (ClientPtr client)
}
static void
-ResFindPixmaps (pointer value, XID id, pointer cdata)
+ResFindPixmaps (void * value, XID id, void * cdata)
{
unsigned long *bytes = (unsigned long *)cdata;
PixmapPtr pix = (PixmapPtr)value;
@@ -216,7 +216,7 @@ ProcXResQueryClientPixmapBytes (ClientPtr client)
bytes = 0;
FindClientResourcesByType(clients[clientID], RT_PIXMAP, ResFindPixmaps,
- (pointer)(&bytes));
+ (void *)(&bytes));
rep.type = X_Reply;
rep.sequenceNumber = client->sequence;
diff --git a/nx-X11/programs/Xserver/Xext/xtest1dd.c b/nx-X11/programs/Xserver/Xext/xtest1dd.c
index 81d283c36..c78cceed0 100644
--- a/nx-X11/programs/Xserver/Xext/xtest1dd.c
+++ b/nx-X11/programs/Xserver/Xext/xtest1dd.c
@@ -1613,5 +1613,5 @@ ClientPtr client;
rep.size_return = ACTION_ARRAY_SIZE;
WriteReplyToClient(client,
sizeof(xTestQueryInputSizeReply),
- (pointer) &rep);
+ (void *) &rep);
}
diff --git a/nx-X11/programs/Xserver/Xext/xtest1di.c b/nx-X11/programs/Xserver/Xext/xtest1di.c
index d95b30612..985193a89 100644
--- a/nx-X11/programs/Xserver/Xext/xtest1di.c
+++ b/nx-X11/programs/Xserver/Xext/xtest1di.c
@@ -152,7 +152,7 @@ static void SEventXTestDispatch(
);
static int XTestCurrentClientGone(
- pointer /* value */,
+ void * /* value */,
XID /* id */
);
@@ -752,7 +752,7 @@ XTestResetProc(unused)
/*ARGSUSED*/
static int
XTestCurrentClientGone(value, id)
- pointer value;
+ void * value;
XID id;
{
/*
diff --git a/nx-X11/programs/Xserver/Xext/xvmain.c b/nx-X11/programs/Xserver/Xext/xvmain.c
index 8934f77f2..bbbb34dcf 100644
--- a/nx-X11/programs/Xserver/Xext/xvmain.c
+++ b/nx-X11/programs/Xserver/Xext/xvmain.c
@@ -139,12 +139,12 @@ static Bool XvCloseScreen(int, ScreenPtr);
static Bool XvDestroyPixmap(PixmapPtr);
static Bool XvDestroyWindow(WindowPtr);
static void XvResetProc(ExtensionEntry*);
-static int XvdiDestroyGrab(pointer, XID);
-static int XvdiDestroyEncoding(pointer, XID);
-static int XvdiDestroyVideoNotify(pointer, XID);
-static int XvdiDestroyPortNotify(pointer, XID);
-static int XvdiDestroyVideoNotifyList(pointer, XID);
-static int XvdiDestroyPort(pointer, XID);
+static int XvdiDestroyGrab(void *, XID);
+static int XvdiDestroyEncoding(void *, XID);
+static int XvdiDestroyVideoNotify(void *, XID);
+static int XvdiDestroyPortNotify(void *, XID);
+static int XvdiDestroyVideoNotifyList(void *, XID);
+static int XvdiDestroyPort(void *, XID);
static int XvdiSendVideoNotify(XvPortPtr, DrawablePtr, int);
@@ -295,7 +295,7 @@ XvScreenInit(ScreenPtr pScreen)
return BadAlloc;
}
- pScreen->devPrivates[XvScreenIndex].ptr = (pointer)pxvs;
+ pScreen->devPrivates[XvScreenIndex].ptr = (void *)pxvs;
pxvs->DestroyPixmap = pScreen->DestroyPixmap;
@@ -327,7 +327,7 @@ XvCloseScreen(
xfree(pxvs);
- pScreen->devPrivates[XvScreenIndex].ptr = (pointer)NULL;
+ pScreen->devPrivates[XvScreenIndex].ptr = (void *)NULL;
return (*pScreen->CloseScreen)(ii, pScreen);
@@ -479,20 +479,20 @@ XvdiVideoStopped(XvPortPtr pPort, int reason)
}
static int
-XvdiDestroyPort(pointer pPort, XID id)
+XvdiDestroyPort(void * pPort, XID id)
{
return (* ((XvPortPtr)pPort)->pAdaptor->ddFreePort)(pPort);
}
static int
-XvdiDestroyGrab(pointer pGrab, XID id)
+XvdiDestroyGrab(void * pGrab, XID id)
{
((XvGrabPtr)pGrab)->client = (ClientPtr)NULL;
return Success;
}
static int
-XvdiDestroyVideoNotify(pointer pn, XID id)
+XvdiDestroyVideoNotify(void * pn, XID id)
{
/* JUST CLEAR OUT THE client POINTER FIELD */
@@ -501,7 +501,7 @@ XvdiDestroyVideoNotify(pointer pn, XID id)
}
static int
-XvdiDestroyPortNotify(pointer pn, XID id)
+XvdiDestroyPortNotify(void * pn, XID id)
{
/* JUST CLEAR OUT THE client POINTER FIELD */
@@ -510,7 +510,7 @@ XvdiDestroyPortNotify(pointer pn, XID id)
}
static int
-XvdiDestroyVideoNotifyList(pointer pn, XID id)
+XvdiDestroyVideoNotifyList(void * pn, XID id)
{
XvVideoNotifyPtr npn,cpn;
@@ -529,7 +529,7 @@ XvdiDestroyVideoNotifyList(pointer pn, XID id)
}
static int
-XvdiDestroyEncoding(pointer value, XID id)
+XvdiDestroyEncoding(void * value, XID id)
{
return Success;
}
diff --git a/nx-X11/programs/Xserver/Xext/xvmc.c b/nx-X11/programs/Xserver/Xext/xvmc.c
index 37fb153ab..30de35a2b 100644
--- a/nx-X11/programs/Xserver/Xext/xvmc.c
+++ b/nx-X11/programs/Xserver/Xext/xvmc.c
@@ -66,7 +66,7 @@ typedef struct {
static int
-XvMCDestroyContextRes(pointer data, XID id)
+XvMCDestroyContextRes(void * data, XID id)
{
XvMCContextPtr pContext = (XvMCContextPtr)data;
@@ -82,7 +82,7 @@ XvMCDestroyContextRes(pointer data, XID id)
}
static int
-XvMCDestroySurfaceRes(pointer data, XID id)
+XvMCDestroySurfaceRes(void * data, XID id)
{
XvMCSurfacePtr pSurface = (XvMCSurfacePtr)data;
XvMCContextPtr pContext = pSurface->context;
@@ -91,14 +91,14 @@ XvMCDestroySurfaceRes(pointer data, XID id)
(*pScreenPriv->adaptors[pContext->adapt_num].DestroySurface)(pSurface);
xfree(pSurface);
- XvMCDestroyContextRes((pointer)pContext, pContext->context_id);
+ XvMCDestroyContextRes((void *)pContext, pContext->context_id);
return Success;
}
static int
-XvMCDestroySubpictureRes(pointer data, XID id)
+XvMCDestroySubpictureRes(void * data, XID id)
{
XvMCSubpicturePtr pSubpict = (XvMCSubpicturePtr)data;
XvMCContextPtr pContext = pSubpict->context;
@@ -107,7 +107,7 @@ XvMCDestroySubpictureRes(pointer data, XID id)
(*pScreenPriv->adaptors[pContext->adapt_num].DestroySubpicture)(pSubpict);
xfree(pSubpict);
- XvMCDestroyContextRes((pointer)pContext, pContext->context_id);
+ XvMCDestroyContextRes((void *)pContext, pContext->context_id);
return Success;
}
@@ -729,7 +729,7 @@ XvMCScreenInit(ScreenPtr pScreen, int num, XvMCAdaptorPtr pAdapt)
if(!(pScreenPriv = (XvMCScreenPtr)xalloc(sizeof(XvMCScreenRec))))
return BadAlloc;
- pScreen->devPrivates[XvMCScreenIndex].ptr = (pointer)pScreenPriv;
+ pScreen->devPrivates[XvMCScreenIndex].ptr = (void *)pScreenPriv;
pScreenPriv->CloseScreen = pScreen->CloseScreen;
pScreen->CloseScreen = XvMCCloseScreen;
diff --git a/nx-X11/programs/Xserver/Xext/xvmcext.h b/nx-X11/programs/Xserver/Xext/xvmcext.h
index c7eba30ad..7cb8af24d 100644
--- a/nx-X11/programs/Xserver/Xext/xvmcext.h
+++ b/nx-X11/programs/Xserver/Xext/xvmcext.h
@@ -32,15 +32,15 @@ typedef struct {
unsigned short height;
CARD32 flags;
int refcnt;
- pointer port_priv;
- pointer driver_priv;
+ void * port_priv;
+ void * driver_priv;
} XvMCContextRec, *XvMCContextPtr;
typedef struct {
XID surface_id;
int surface_type_id;
XvMCContextPtr context;
- pointer driver_priv;
+ void * driver_priv;
} XvMCSurfaceRec, *XvMCSurfacePtr;
@@ -53,7 +53,7 @@ typedef struct {
int entry_bytes;
char component_order[4];
XvMCContextPtr context;
- pointer driver_priv;
+ void * driver_priv;
} XvMCSubpictureRec, *XvMCSubpicturePtr;
typedef int (*XvMCCreateContextProcPtr) (