Skip to content

N
nx-libs
Commit 68dd0b52 authored by Keith Packard's avatar Keith Packard Committed by Mike Gabriel
Browse files
Options

Replace 'pointer' type with 'void *'

This lets us stop using the 'pointer' typedef in Xdefs.h as 'pointer' is used throughout the X server for other things, and having duplicate names generates compiler warnings. Signed-off-by: 's avatarKeith Packard <keithp@keithp.com> Reviewed-by: 's avatarEric Anholt <eric@anholt.net> Rebased against NX: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
parent e9f44221
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 636 additions and 636 deletions
nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_span.c
View file @ 68dd0b52
......@@ -115,7 +115,7 @@ static unsigned long read_pixel( XMesaDisplay *dpy,
XMesaDestroyImage( pixel );
}
#else
(*dpy->GetImage)(d, x, y, 1, 1, ZPixmap, ~0L, (pointer)&p);
(*dpy->GetImage)(d, x, y, 1, 1, ZPixmap, ~0L, (void *)&p);
#endif
return p;
}
......@@ -3834,7 +3834,7 @@ get_row_ci(GLcontext *ctx, struct gl_renderbuffer *rb,
#else
(*xmesa->display->GetImage)(xrb->drawable,
x, y, n, 1, ZPixmap,
~0L, (pointer)index);
~0L, (void *)index);
#endif
}
else if (xrb->ximage) {
......@@ -3869,7 +3869,7 @@ get_row_rgba(GLcontext *ctx, struct gl_renderbuffer *rb,
error = (!span->data);
(*xmesa->display->GetImage)(xrb->drawable,
x, YFLIP(xrb, y), n, 1, ZPixmap,
~0L, (pointer)span->data);
~0L, (void *)span->data);
#else
int k;
y = YFLIP(xrb, y);
......
nx-X11/include/Xdefs.h
View file @ 68dd0b52
......@@ -103,8 +103,8 @@ typedef FSID AccContext;
typedef struct timeval **OSTimePtr;
typedef void (* BlockHandlerProcPtr)(pointer /* blockData */,
typedef void (* BlockHandlerProcPtr)(void * /* blockData */,
OSTimePtr /* pTimeout */,
pointer /* pReadmask */);
void * /* pReadmask */);
#endif
nx-X11/include/extensions/XKBsrv.h
View file @ 68dd0b52
......@@ -294,7 +294,7 @@ extern char * XkbModelUsed,*XkbLayoutUsed,*XkbVariantUsed,*XkbOptionsUsed;
extern Bool noXkbExtension;
extern Bool XkbWantRulesProp;
extern pointer XkbLastRepeatEvent;
extern void * XkbLastRepeatEvent;
extern CARD32 xkbDebugFlags;
extern CARD32 xkbDebugCtrls;
......@@ -336,7 +336,7 @@ extern int DeviceButtonPress,DeviceButtonRelease;
#define IsKeypadKey(s) XkbKSIsKeypad(s)
#define Status int
#define XPointer pointer
#define XPointer void *
#define Display struct _XDisplay
#ifndef True
......@@ -715,7 +715,7 @@ extern void XkbHandleBell(
BOOL /* eventOnly */,
DeviceIntPtr /* kbd */,
CARD8 /* percent */,
pointer /* ctrl */,
void * /* ctrl */,
CARD8 /* class */,
Atom /* name */,
WindowPtr /* pWin */,
......
nx-X11/include/extensions/lbxopts.h
View file @ 68dd0b52
......@@ -96,8 +96,8 @@ struct iovec {
typedef void *LbxStreamCompHandle;
typedef struct _LbxStreamOpts {
LbxStreamCompHandle (*streamCompInit)(int fd, pointer arg);
pointer streamCompArg;
LbxStreamCompHandle (*streamCompInit)(int fd, void * arg);
void * streamCompArg;
int (*streamCompStuffInput)(
int fd,
unsigned char *buf,
......
nx-X11/include/extensions/syncstr.h
View file @ 68dd0b52
......@@ -396,11 +396,11 @@ typedef struct _SysCounterInfo {
CARD64 bracket_less;
SyncCounterType counterType; /* how can this counter change */
void (*QueryValue)(
pointer /*pCounter*/,
void * /*pCounter*/,
CARD64 * /*freshvalue*/
);
void (*BracketValues)(
pointer /*pCounter*/,
void * /*pCounter*/,
CARD64 * /*lessthan*/,
CARD64 * /*greaterthan*/
);
......@@ -465,16 +465,16 @@ typedef union {
} SyncAwaitUnion;
extern pointer SyncCreateSystemCounter(
extern void * SyncCreateSystemCounter(
char * /* name */,
CARD64 /* inital_value */,
CARD64 /* resolution */,
SyncCounterType /* change characterization */,
void (* /*QueryValue*/ ) (
pointer /* pCounter */,
void * /* pCounter */,
CARD64 * /* pValue_return */), /* XXX prototype */
void (* /*BracketValues*/) (
pointer /* pCounter */,
void * /* pCounter */,
CARD64 * /* pbracket_less */,
CARD64 * /* pbracket_greater */)
);
......@@ -485,7 +485,7 @@ extern void SyncChangeCounter(
);
extern void SyncDestroySystemCounter(
pointer pCounter
void * pCounter
);
extern void InitServertime(void);
......
nx-X11/include/extensions/xtrapproto.h
View file @ 68dd0b52
......@@ -44,7 +44,7 @@ SOFTWARE.
# define Bool int
#endif
/* xtrapdi.c */
int XETrapDestroyEnv (pointer value , XID id );
int XETrapDestroyEnv (void * value , XID id );
void XETrapCloseDown ( ExtensionEntry *extEntry );
Bool XETrapRedirectDevices (void );
void DEC_XTRAPInit (void );
......
nx-X11/programs/Xserver/GL/glx/glxcmds.c
View file @ 68dd0b52
......@@ -229,7 +229,7 @@ int DoCreateContext(__GLXclientState *cl, GLXContextID gcId,
/*
** Register this context as a resource.
*/
if (!AddResource(gcId, __glXContextRes, (pointer)glxc)) {
if (!AddResource(gcId, __glXContextRes, (void *)glxc)) {
if (!isDirect) {
(*glxc->gc->exports.destroyContext)((__GLcontext *)glxc->gc);
}
......@@ -1760,7 +1760,7 @@ static int __glXBindSwapBarrierSGIX(__GLXclientState *cl, GLbyte *pc)
if (ret == Success) {
if (barrier)
/* add source for cleanup when drawable is gone */
AddResource(drawable, __glXSwapBarrierRes, (pointer)screen);
AddResource(drawable, __glXSwapBarrierRes, (void *)screen);
else
/* delete source */
FreeResourceByType(drawable, __glXSwapBarrierRes, FALSE);
......
nx-X11/programs/Xserver/GL/glx/glxext.c
View file @ 68dd0b52
......@@ -417,7 +417,7 @@ static int __glXDispatch(ClientPtr client)
** with the client so we will be notified when the client dies.
*/
XID xid = FakeClientID(client->index);
if (!AddResource( xid, __glXClientRes, (pointer)(long)client->index)) {
if (!AddResource( xid, __glXClientRes, (void *)(long)client->index)) {
return BadAlloc;
}
ResetClientState(client->index);
......@@ -471,7 +471,7 @@ static int __glXSwapDispatch(ClientPtr client)
** with the client so we will be notified when the client dies.
*/
XID xid = FakeClientID(client->index);
if (!AddResource( xid, __glXClientRes, (pointer)(long)client->index)) {
if (!AddResource( xid, __glXClientRes, (void *)(long)client->index)) {
return BadAlloc;
}
ResetClientState(client->index);
......
nx-X11/programs/Xserver/GL/glxmodule.c
View file @ 68dd0b52
......@@ -1236,11 +1236,11 @@ static XF86ModuleVersionInfo VersRec =
XF86ModuleData glxModuleData = { &VersRec, glxSetup, NULL };
static pointer
glxSetup(pointer module, pointer opts, int *errmaj, int *errmin)
static void *
glxSetup(void * module, void * opts, int *errmaj, int *errmin)
{
static Bool setupDone = FALSE;
pointer GLcore = NULL;
void * GLcore = NULL;
#ifdef GLX_USE_SGI_SI
char GLcoreName[] = "GL";
#else
......
nx-X11/programs/Xserver/GL/mesa/GLcore/GLcoremodule.c
View file @ 68dd0b52
......@@ -56,9 +56,9 @@ static XF86ModuleVersionInfo VersRec =
XF86ModuleData GLcoreModuleData = { &VersRec, GLcoreSetup, NULL };
static pointer
GLcoreSetup(pointer module, pointer opts, int *errmaj, int *errmin)
static void *
GLcoreSetup(void * module, void * opts, int *errmaj, int *errmin)
{
/* Need a non-NULL return value to indicate success */
return (pointer)1;
return (void *)1;
}
nx-X11/programs/Xserver/XTrap/xf86XTrapModule.c
View file @ 68dd0b52
......@@ -41,11 +41,11 @@ static XF86ModuleVersionInfo xtrapVersRec =
XF86ModuleData xtrapModuleData = { &xtrapVersRec, xtrapSetup, NULL };
static pointer
xtrapSetup(pointer module, pointer opts, int *errmaj, int *errmin) {
static void *
xtrapSetup(void * module, void * opts, int *errmaj, int *errmin) {
LoadExtension(&xtrapExt, FALSE);
/* Need a non-NULL return value to indicate success */
return (pointer)1;
return (void *)1;
}
#endif /* XFree86LOADER */
nx-X11/programs/Xserver/XTrap/xtrapdi.c
View file @ 68dd0b52
......@@ -195,7 +195,7 @@ static void GetSendColorPlanesRep (ClientPtr client , xResourceReq *req );
* client would be reset here.
*
*/
int XETrapDestroyEnv(pointer value, XID id)
int XETrapDestroyEnv(void * value, XID id)
{
xXTrapReq request;
XETrapEnv *penv = XETenv[(long)value];
......@@ -251,7 +251,7 @@ void XETrapCloseDown(ExtensionEntry *extEntry)
{
if (XETenv[i] != NULL)
{
XETrapDestroyEnv((pointer)i,0L);
XETrapDestroyEnv((void *)i,0L);
}
}
ignore_grabs = False;
......@@ -508,7 +508,7 @@ int XETrapCreateEnv(ClientPtr client)
penv->protocol = 31; /* default to backwards compatibility */
/* prep for client's departure (for memory dealloc, cleanup) */
AddResource(FakeClientID(client->index),XETrapType,
(pointer)(long)(client->index));
(void *)(long)(client->index));
if (XETrapRedirectDevices() == False)
{
status = XETrapErrorBase + BadDevices;
......
nx-X11/programs/Xserver/Xext/appgroup.c
View file @ 68dd0b52
......@@ -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);
}
}
nx-X11/programs/Xserver/Xext/appgroup.h
View file @ 68dd0b52
......@@ -2,8 +2,8 @@
void XagClientStateChange(
CallbackListPtr* pcbl,
pointer nulldata,
pointer calldata);
void * nulldata,
void * calldata);
int ProcXagCreate (
register ClientPtr client);
int ProcXagDestroy(
......
nx-X11/programs/Xserver/Xext/extmod/modinit.c
View file @ 68dd0b52
......@@ -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 */
nx-X11/programs/Xserver/Xext/mbuf.c
View file @ 68dd0b52
......@@ -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;
......
nx-X11/programs/Xserver/Xext/mbufbf.c
View file @ 68dd0b52
......@@ -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;
......
nx-X11/programs/Xserver/Xext/mbufpx.c
View file @ 68dd0b52
......@@ -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);
......
nx-X11/programs/Xserver/Xext/panoramiX.c
View file @ 68dd0b52
......@@ -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);
......
nx-X11/programs/Xserver/Xext/panoramiXsrv.h
View file @ 68dd0b52
......@@ -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);
......
nx-X11/programs/Xserver/Xext/saver.c
View file @ 68dd0b52
......@@ -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:
......
nx-X11/programs/Xserver/Xext/security.c
View file @ 68dd0b52
......@@ -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;
......
nx-X11/programs/Xserver/Xext/shape.c
View file @ 68dd0b52
......@@ -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;
......
nx-X11/programs/Xserver/Xext/shm.c
View file @ 68dd0b52
......@@ -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);
}
......
nx-X11/programs/Xserver/Xext/sleepuntil.c
View file @ 68dd0b52
......@@ -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;
}
}
nx-X11/programs/Xserver/Xext/sleepuntil.h
View file @ 68dd0b52
......@@ -39,9 +39,9 @@ extern int ClientSleepUntil(
TimeStamp *revive,
void (*notifyFunc)(
ClientPtr /* client */,
pointer /* closure */
void * /* closure */
),
pointer Closure
void * Closure
);
#endif
nx-X11/programs/Xserver/Xext/sync.c
View file @ 68dd0b52
......@@ -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;
{
......
nx-X11/programs/Xserver/Xext/vidmodeproc.h
View file @ 68dd0b52
......@@ -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);
......
nx-X11/programs/Xserver/Xext/xevie.c
View file @ 68dd0b52
......@@ -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);
......
nx-X11/programs/Xserver/Xext/xf86dga2.c
View file @ 68dd0b52
......@@ -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;
}
......
nx-X11/programs/Xserver/Xext/xf86misc.c
View file @ 68dd0b52
......@@ -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);
......
nx-X11/programs/Xserver/Xext/xf86miscproc.h
View file @ 68dd0b52
......@@ -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,
......
nx-X11/programs/Xserver/Xext/xf86vmode.c
View file @ 68dd0b52
......@@ -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");
......
nx-X11/programs/Xserver/Xext/xres.c
View file @ 68dd0b52
......@@ -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;
......
nx-X11/programs/Xserver/Xext/xtest1dd.c
View file @ 68dd0b52
......@@ -1613,5 +1613,5 @@ ClientPtr client;
rep.size_return = ACTION_ARRAY_SIZE;
WriteReplyToClient(client,
sizeof(xTestQueryInputSizeReply),
(pointer) &rep);
(void *) &rep);
}
nx-X11/programs/Xserver/Xext/xtest1di.c
View file @ 68dd0b52
......@@ -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;
{
/*
......
nx-X11/programs/Xserver/Xext/xvmain.c
View file @ 68dd0b52
......@@ -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;
}
......
nx-X11/programs/Xserver/Xext/xvmc.c
View file @ 68dd0b52
......@@ -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;
......
nx-X11/programs/Xserver/Xext/xvmcext.h
View file @ 68dd0b52
......@@ -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) (
......
nx-X11/programs/Xserver/Xi/devbell.c
View file @ 68dd0b52
......@@ -104,7 +104,7 @@ ProcXDeviceBell (client)
int base;
int newpercent;
CARD8 class;
pointer ctrl;
void * ctrl;
BellProcPtr proc;
REQUEST(xDeviceBellReq);
......@@ -137,7 +137,7 @@ ProcXDeviceBell (client)
}
base = k->ctrl.bell;
proc = k->BellProc;
ctrl = (pointer) &(k->ctrl);
ctrl = (void *) &(k->ctrl);
class = KbdFeedbackClass;
}
else if (stuff->feedbackclass == BellFeedbackClass)
......@@ -153,7 +153,7 @@ ProcXDeviceBell (client)
}
base = b->ctrl.percent;
proc = b->BellProc;
ctrl = (pointer) &(b->ctrl);
ctrl = (void *) &(b->ctrl);
class = BellFeedbackClass;
}
else
......
nx-X11/programs/Xserver/Xi/exevents.c
View file @ 68dd0b52
......@@ -143,7 +143,7 @@ ProcessOtherEvent (xE, other, count)
DeviceEventInfoRec eventinfo;
eventinfo.events = (xEventPtr) xE;
eventinfo.count = count;
CallCallbacks(&DeviceEventCallback, (pointer)&eventinfo);
CallCallbacks(&DeviceEventCallback, (void *)&eventinfo);
}
for (i=1; i<count; i++)
if ((++xV)->type == DeviceValuator)
......@@ -751,7 +751,7 @@ AddExtensionClient (pWin, client, mask, mskidx)
others->resource = FakeClientID(client->index);
others->next = pWin->optional->inputMasks->inputClients;
pWin->optional->inputMasks->inputClients = others;
if (!AddResource(others->resource, RT_INPUTCLIENT, (pointer)pWin))
if (!AddResource(others->resource, RT_INPUTCLIENT, (void *)pWin))
return BadAlloc;
return Success;
}
......@@ -846,7 +846,7 @@ InputClientGone(pWin, id)
{
other->resource = FakeClientID(0);
if (!AddResource(other->resource, RT_INPUTCLIENT,
(pointer)pWin))
(void *)pWin))
return BadAlloc;
}
}
......
nx-X11/programs/Xserver/Xi/stubs.c
View file @ 68dd0b52
......@@ -209,7 +209,7 @@ AddOtherInputDevices ()
DeviceIntPtr dev;
DeviceProc deviceProc;
pointer private;
void * private;
dev = (DeviceIntPtr) AddInputDevice(deviceProc, TRUE);
dev->public.devicePrivate = private;
......
nx-X11/programs/Xserver/composite/compext.c
View file @ 68dd0b52
......@@ -42,8 +42,8 @@ typedef struct _CompositeClient {
static void
CompositeClientCallback (CallbackListPtr *list,
pointer closure,
pointer data)
void *closure,
void *data)
{
NewClientInfoRec *clientinfo = (NewClientInfoRec *) data;
ClientPtr pClient = clientinfo->client;
......@@ -59,7 +59,7 @@ CompositeResetProc (ExtensionEntry *extEntry)
}
static int
FreeCompositeClientWindow (pointer value, XID ccwid)
FreeCompositeClientWindow (void * value, XID ccwid)
{
WindowPtr pWin = value;
......@@ -68,7 +68,7 @@ FreeCompositeClientWindow (pointer value, XID ccwid)
}
static int
FreeCompositeClientSubwindows (pointer value, XID ccwid)
FreeCompositeClientSubwindows (void * value, XID ccwid)
{
WindowPtr pWin = value;
......@@ -203,7 +203,7 @@ ProcCompositeCreateRegionFromBorderClip (ClientPtr client)
return BadAlloc;
REGION_TRANSLATE (pScreen, pRegion, -pWin->drawable.x, -pWin->drawable.y);
if (!AddResource (stuff->region, RegionResType, (pointer) pRegion))
if (!AddResource (stuff->region, RegionResType, (void *) pRegion))
return BadAlloc;
return(client->noClientException);
......@@ -237,7 +237,7 @@ ProcCompositeNameWindowPixmap (ClientPtr client)
++pPixmap->refcnt;
if (!AddResource (stuff->pixmap, RT_PIXMAP, (pointer) pPixmap))
if (!AddResource (stuff->pixmap, RT_PIXMAP, (void *) pPixmap))
return BadAlloc;
return(client->noClientException);
......
nx-X11/programs/Xserver/composite/compinit.c
View file @ 68dd0b52
......@@ -93,9 +93,9 @@ compScreenUpdate (ScreenPtr pScreen)
static void
compBlockHandler (int i,
pointer blockData,
pointer pTimeout,
pointer pReadmask)
void *blockData,
void *pTimeout,
void *pReadmask)
{
ScreenPtr pScreen = screenInfo.screens[i];
CompScreenPtr cs = GetCompScreen (pScreen);
......@@ -385,6 +385,6 @@ compScreenInit (ScreenPtr pScreen)
cs->CloseScreen = pScreen->CloseScreen;
pScreen->CloseScreen = compCloseScreen;
pScreen->devPrivates[CompScreenPrivateIndex].ptr = (pointer) cs;
pScreen->devPrivates[CompScreenPrivateIndex].ptr = (void *) cs;
return TRUE;
}
nx-X11/programs/Xserver/composite/compwindow.c
View file @ 68dd0b52
......@@ -30,7 +30,7 @@
#ifdef COMPOSITE_DEBUG
static int
compCheckWindow (WindowPtr pWin, pointer data)
compCheckWindow (WindowPtr pWin, void * data)
{
ScreenPtr pScreen = pWin->drawable.pScreen;
PixmapPtr pWinPixmap = (*pScreen->GetWindowPixmap) (pWin);
......@@ -71,7 +71,7 @@ typedef struct _compPixmapVisit {
} CompPixmapVisitRec, *CompPixmapVisitPtr;
static Bool
compRepaintBorder (ClientPtr pClient, pointer closure)
compRepaintBorder (ClientPtr pClient, void * closure)
{
WindowPtr pWindow = LookupWindow ((XID) closure, pClient);
......@@ -88,7 +88,7 @@ compRepaintBorder (ClientPtr pClient, pointer closure)
}
static int
compSetPixmapVisitWindow (WindowPtr pWindow, pointer data)
compSetPixmapVisitWindow (WindowPtr pWindow, void * data)
{
CompPixmapVisitPtr pVisit = (CompPixmapVisitPtr) data;
ScreenPtr pScreen = pWindow->drawable.pScreen;
......@@ -105,7 +105,7 @@ compSetPixmapVisitWindow (WindowPtr pWindow, pointer data)
SetBorderSize (pWindow);
if (HasBorder (pWindow))
QueueWorkProc (compRepaintBorder, serverClient,
(pointer) pWindow->drawable.id);
(void *) pWindow->drawable.id);
return WT_WALKCHILDREN;
}
......@@ -116,7 +116,7 @@ compSetPixmap (WindowPtr pWindow, PixmapPtr pPixmap)
visitRec.pWindow = pWindow;
visitRec.pPixmap = pPixmap;
TraverseTree (pWindow, compSetPixmapVisitWindow, (pointer) &visitRec);
TraverseTree (pWindow, compSetPixmapVisitWindow, (void *) &visitRec);
compCheckTree (pWindow->drawable.pScreen);
}
......
nx-X11/programs/Xserver/damageext/damageext.c
View file @ 68dd0b52
......@@ -216,7 +216,7 @@ ProcDamageCreate (ClientPtr client)
xfree (pDamageExt);
return BadAlloc;
}
if (!AddResource (stuff->damage, DamageExtType, (pointer) pDamageExt))
if (!AddResource (stuff->damage, DamageExtType, (void *) pDamageExt))
return BadAlloc;
DamageRegister (pDamageExt->pDrawable, pDamageExt->pDamage);
......@@ -376,8 +376,8 @@ SProcDamageDispatch (ClientPtr client)
static void
DamageClientCallback (CallbackListPtr *list,
pointer closure,
pointer data)
void * closure,
void * data)
{
NewClientInfoRec *clientinfo = (NewClientInfoRec *) data;
ClientPtr pClient = clientinfo->client;
......@@ -396,7 +396,7 @@ DamageResetProc (ExtensionEntry *extEntry)
}
static int
FreeDamageExt (pointer value, XID did)
FreeDamageExt (void * value, XID did)
{
DamageExtPtr pDamageExt = (DamageExtPtr) value;
......@@ -416,7 +416,7 @@ FreeDamageExt (pointer value, XID did)
}
static int
FreeDamageExtWin (pointer value, XID wid)
FreeDamageExtWin (void * value, XID wid)
{
DamageExtPtr pDamageExt = (DamageExtPtr) value;
......
nx-X11/programs/Xserver/dbe/dbe.c
View file @ 68dd0b52
......@@ -188,11 +188,11 @@ DbeAllocWinPriv(pScreen)
{
if ((size = *sizes))
{
ppriv->ptr = (pointer)ptr;
ppriv->ptr = (void *)ptr;
ptr += size;
}
else
ppriv->ptr = (pointer)NULL;
ppriv->ptr = (void *)NULL;
}
}
......@@ -497,7 +497,7 @@ ProcDbeAllocateBackBufferName(client)
/* Make the window priv a DBE window priv resource. */
if (!AddResource(stuff->buffer, dbeWindowPrivResType,
(pointer)pDbeWindowPriv))
(void *)pDbeWindowPriv))
{
xfree(pDbeWindowPriv);
return(BadAlloc);
......@@ -524,7 +524,7 @@ ProcDbeAllocateBackBufferName(client)
/* Actually connect the window priv to the window. */
pWin->devPrivates[dbeWindowPrivIndex].ptr = (pointer)pDbeWindowPriv;
pWin->devPrivates[dbeWindowPrivIndex].ptr = (void *)pDbeWindowPriv;
} /* if -- There is no buffer associated with the window. */
......@@ -592,7 +592,7 @@ ProcDbeAllocateBackBufferName(client)
/* Associate the new ID with an existing window priv. */
if (!AddResource(stuff->buffer, dbeWindowPrivResType,
(pointer)pDbeWindowPriv))
(void *)pDbeWindowPriv))
{
pDbeWindowPriv->IDs[i] = DBE_FREE_ID_ELEMENT;
return(BadAlloc);
......@@ -1490,7 +1490,7 @@ DbeSetupBackgroundPainter(pWin, pGC)
WindowPtr pWin;
GCPtr pGC;
{
pointer gcvalues[4];
void *gcvalues[4];
int ts_x_origin, ts_y_origin;
PixUnion background;
int backgroundState;
......@@ -1516,16 +1516,16 @@ DbeSetupBackgroundPainter(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;
......@@ -1562,7 +1562,7 @@ DbeSetupBackgroundPainter(pWin, pGC)
*****************************************************************************/
static int
DbeDrawableDelete(pDrawable, id)
pointer pDrawable;
void *pDrawable;
XID id;
{
return(Success);
......@@ -1583,7 +1583,7 @@ DbeDrawableDelete(pDrawable, id)
*****************************************************************************/
static int
DbeWindowPrivDelete(pDbeWinPriv, id)
pointer pDbeWinPriv;
void *pDbeWinPriv;
XID id;
{
DbeScreenPrivPtr pDbeScreenPriv;
......@@ -1668,7 +1668,7 @@ DbeWindowPrivDelete(pDbeWinPriv, id)
{
/* Reset the DBE window priv pointer. */
pDbeWindowPriv->pWindow->devPrivates[dbeWindowPrivIndex].ptr =
(pointer)NULL;
(void *)NULL;
/* We are done with the window priv. */
xfree(pDbeWindowPriv);
......@@ -1888,7 +1888,7 @@ DbeExtensionInit()
return;
}
pScreen->devPrivates[dbeScreenPrivIndex].ptr = (pointer)pDbeScreenPriv;
pScreen->devPrivates[dbeScreenPrivIndex].ptr = (void *)pDbeScreenPriv;
/* Store the DBE priv priv size info for later use when allocating
* priv privs at the driver level.
......
nx-X11/programs/Xserver/dbe/dbemodule.c
View file @ 68dd0b52
......@@ -38,11 +38,11 @@ static XF86ModuleVersionInfo VersRec =
*/
XF86ModuleData dbeModuleData = { &VersRec, dbeSetup, NULL };
static pointer
dbeSetup(pointer module, pointer opts, int *errmaj, int *errmin)
static void *
dbeSetup(void * module, void * opts, int *errmaj, int *errmin)
{
LoadExtension(&dbeExt, FALSE);
/* Need a non-NULL return value to indicate success */
return (pointer)1;
return (void *)1;
}
nx-X11/programs/Xserver/dbe/midbe.c
View file @ 68dd0b52
......@@ -214,7 +214,7 @@ miDbeAllocBackBufferName(pWin, bufId, swapAction)
/* Make the back pixmap a DBE drawable resource. */
if (!AddResource(bufId, dbeDrawableResType,
(pointer)pDbeWindowPrivPriv->pBackBuffer))
(void *)pDbeWindowPrivPriv->pBackBuffer))
{
/* free the buffer and the drawable resource */
FreeResource(bufId, RT_NONE);
......@@ -224,7 +224,7 @@ miDbeAllocBackBufferName(pWin, bufId, swapAction)
/* Attach the priv priv to the priv. */
pDbeWindowPriv->devPrivates[miDbeWindowPrivPrivIndex].ptr =
(pointer)pDbeWindowPrivPriv;
(void *)pDbeWindowPrivPriv;
/* Clear the back buffer. */
......@@ -252,7 +252,7 @@ miDbeAllocBackBufferName(pWin, bufId, swapAction)
/* Associate the new ID with an existing pixmap. */
pDbeWindowPrivPriv = MI_DBE_WINDOW_PRIV_PRIV(pDbeWindowPriv);
if (!AddResource(bufId, dbeDrawableResType,
(pointer)pDbeWindowPrivPriv->pBackBuffer))
(void *)pDbeWindowPrivPriv->pBackBuffer))
{
return(BadAlloc);
}
......@@ -286,7 +286,7 @@ miDbeAliasBuffers(pDbeWindowPriv)
for (i = 0; i < pDbeWindowPriv->nBufferIDs; i++)
{
ChangeResourceValue(pDbeWindowPriv->IDs[i], dbeDrawableResType,
(pointer)pDbeWindowPrivPriv->pBackBuffer);
(void *)pDbeWindowPrivPriv->pBackBuffer);
}
} /* miDbeAliasBuffers() */
......
nx-X11/programs/Xserver/dix/colormap.c
View file @ 68dd0b52
......@@ -382,7 +382,7 @@ CreateColormap (Colormap mid, ScreenPtr pScreen, VisualPtr pVisual,
pmap->numPixelsBlue[client] = size;
}
}
if (!AddResource(mid, RT_COLORMAP, (pointer)pmap))
if (!AddResource(mid, RT_COLORMAP, (void *)pmap))
return (BadAlloc);
/* If the device wants a chance to initialize the colormap in any way,
* this is it. In specific, if this is a Static colormap, this is the
......@@ -422,7 +422,7 @@ CreateColormap (Colormap mid, ScreenPtr pScreen, VisualPtr pVisual,
* \param value must conform to DeleteType
*/
int
FreeColormap (pointer value, XID mid)
FreeColormap (void * value, XID mid)
{
int i;
register EntryPtr pent;
......@@ -431,7 +431,7 @@ FreeColormap (pointer value, XID mid)
if(CLIENT_ID(mid) != SERVER_ID)
{
(*pmap->pScreen->UninstallColormap) (pmap);
WalkTree(pmap->pScreen, (VisitWindowProcPtr)TellNoMap, (pointer) &mid);
WalkTree(pmap->pScreen, (VisitWindowProcPtr)TellNoMap, (void *) &mid);
}
/* This is the device's chance to undo anything it needs to, especially
......@@ -506,7 +506,7 @@ TellNoMap (WindowPtr pwin, Colormap *pmid)
/* Tell window that pmid got uninstalled */
int
TellLostMap (WindowPtr pwin, pointer value)
TellLostMap (WindowPtr pwin, void * value)
{
Colormap *pmid = (Colormap *)value;
xEvent xE;
......@@ -531,7 +531,7 @@ TellLostMap (WindowPtr pwin, pointer value)
/* Tell window that pmid got installed */
int
TellGainedMap (WindowPtr pwin, pointer value)
TellGainedMap (WindowPtr pwin, void * value)
{
Colormap *pmid = (Colormap *)value;
xEvent xE;
......@@ -974,7 +974,7 @@ AllocColor (ColormapPtr pmap,
}
pcr->mid = pmap->mid;
pcr->client = client;
if (!AddResource(FakeClientID(client), RT_CMAPENTRY, (pointer)pcr))
if (!AddResource(FakeClientID(client), RT_CMAPENTRY, (void *)pcr))
return (BadAlloc);
}
return (Success);
......@@ -1599,7 +1599,7 @@ FreePixels(register ColormapPtr pmap, register int client)
* \unused fakeid
*/
int
FreeClientPixels (pointer value, XID fakeid)
FreeClientPixels (void * value, XID fakeid)
{
ColormapPtr pmap;
colorResource *pcr = (colorResource *)value;
......@@ -1674,7 +1674,7 @@ AllocColorCells (int client, ColormapPtr pmap, int colors, int planes,
{
pcr->mid = pmap->mid;
pcr->client = client;
if (!AddResource(FakeClientID(client), RT_CMAPENTRY, (pointer)pcr))
if (!AddResource(FakeClientID(client), RT_CMAPENTRY, (void *)pcr))
ok = BadAlloc;
} else if (pcr)
xfree(pcr);
......@@ -1765,7 +1765,7 @@ AllocColorPlanes (int client, ColormapPtr pmap, int colors,
{
pcr->mid = pmap->mid;
pcr->client = client;
if (!AddResource(FakeClientID(client), RT_CMAPENTRY, (pointer)pcr))
if (!AddResource(FakeClientID(client), RT_CMAPENTRY, (void *)pcr))
ok = BadAlloc;
} else if (pcr)
xfree(pcr);
......
nx-X11/programs/Xserver/dix/cursor.c
View file @ 68dd0b52
......@@ -110,7 +110,7 @@ FreeCursorBits(CursorBitsPtr bits)
* \param value must conform to DeleteType
*/
int
FreeCursor(pointer value, XID cid)
FreeCursor(void * value, XID cid)
{
int nscr;
CursorPtr pCurs = (CursorPtr)value;
......@@ -452,7 +452,7 @@ CreateRootCursor(char *pfilename, unsigned glyph)
0, 0, 0, ~0, ~0, ~0, &curs, serverClient) != Success)
return NullCursor;
if (!AddResource(FakeClientID(0), RT_CURSOR, (pointer)curs))
if (!AddResource(FakeClientID(0), RT_CURSOR, (void *)curs))
return NullCursor;
return curs;
......
nx-X11/programs/Xserver/dix/devices.c
View file @ 68dd0b52
......@@ -1449,7 +1449,7 @@ ProcBell(ClientPtr client)
else
#endif
(*keybd->kbdfeed->BellProc)(newpercent, keybd,
(pointer) &keybd->kbdfeed->ctrl, 0);
(void *) &keybd->kbdfeed->ctrl, 0);
return Success;
}
......
nx-X11/programs/Xserver/dix/dispatch.c
View file @ 68dd0b52
......@@ -531,7 +531,7 @@ ProcCreateWindow(ClientPtr client)
Mask mask = pWin->eventMask;
pWin->eventMask = 0; /* subterfuge in case AddResource fails */
if (!AddResource(stuff->wid, RT_WINDOW, (pointer)pWin))
if (!AddResource(stuff->wid, RT_WINDOW, (void *)pWin))
return BadAlloc;
pWin->eventMask = mask;
}
......@@ -1171,7 +1171,7 @@ ProcGrabServer(register ClientPtr client)
ServerGrabInfoRec grabinfo;
grabinfo.client = client;
grabinfo.grabstate = SERVER_GRABBED;
CallCallbacks(&ServerGrabCallback, (pointer)&grabinfo);
CallCallbacks(&ServerGrabCallback, (void *)&grabinfo);
}
return(client->noClientException);
......@@ -1200,7 +1200,7 @@ UngrabServer(ClientPtr client)
ServerGrabInfoRec grabinfo;
grabinfo.client = client;
grabinfo.grabstate = SERVER_UNGRABBED;
CallCallbacks(&ServerGrabCallback, (pointer)&grabinfo);
CallCallbacks(&ServerGrabCallback, (void *)&grabinfo);
}
}
......@@ -1468,7 +1468,7 @@ ProcListFontsWithInfo(register ClientPtr client)
* \param value must conform to DeleteType
*/
int
dixDestroyPixmap(pointer value, XID pid)
dixDestroyPixmap(void * value, XID pid)
{
PixmapPtr pPixmap = (PixmapPtr)value;
return (*pPixmap->drawable.pScreen->DestroyPixmap)(pPixmap);
......@@ -1527,7 +1527,7 @@ CreatePmap:
{
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);
}
return (BadAlloc);
......@@ -1576,7 +1576,7 @@ ProcCreateGC(register ClientPtr client)
(XID *) &stuff[1], &error);
if (error != Success)
return error;
if (!AddResource(stuff->gc, RT_GC, (pointer)pGC))
if (!AddResource(stuff->gc, RT_GC, (void *)pGC))
return (BadAlloc);
return(client->noClientException);
}
......@@ -2250,7 +2250,7 @@ DoGetImage(register ClientPtr client, int format, Drawable drawable,
nlines,
format,
planemask,
(pointer) pBuf);
(void *) pBuf);
#ifdef XCSECURITY
if (pVisibleRegion)
SecurityCensorImage(client, pVisibleRegion, widthBytesLine,
......@@ -2291,7 +2291,7 @@ DoGetImage(register ClientPtr client, int format, Drawable drawable,
nlines,
format,
plane,
(pointer)pBuf);
(void *)pBuf);
#ifdef XCSECURITY
if (pVisibleRegion)
SecurityCensorImage(client, pVisibleRegion,
......@@ -3122,7 +3122,7 @@ ProcCreateCursor (register ClientPtr client)
/* zeroing the (pad) bits helps some ddx cursor handling */
bzero((char *)srcbits, n);
(* src->drawable.pScreen->GetImage)( (DrawablePtr)src, 0, 0, width, height,
XYPixmap, 1, (pointer)srcbits);
XYPixmap, 1, (void *)srcbits);
if ( msk == (PixmapPtr)NULL)
{
register unsigned char *bits = mskbits;
......@@ -3134,7 +3134,7 @@ ProcCreateCursor (register ClientPtr client)
/* zeroing the (pad) bits helps some ddx cursor handling */
bzero((char *)mskbits, n);
(* msk->drawable.pScreen->GetImage)( (DrawablePtr)msk, 0, 0, width,
height, XYPixmap, 1, (pointer)mskbits);
height, XYPixmap, 1, (void *)mskbits);
}
cm.width = width;
cm.height = height;
......@@ -3144,7 +3144,7 @@ ProcCreateCursor (register ClientPtr client)
stuff->foreRed, stuff->foreGreen, stuff->foreBlue,
stuff->backRed, stuff->backGreen, stuff->backBlue);
if (pCursor && AddResource(stuff->cid, RT_CURSOR, (pointer)pCursor))
if (pCursor && AddResource(stuff->cid, RT_CURSOR, (void *)pCursor))
return (client->noClientException);
return BadAlloc;
}
......@@ -3167,7 +3167,7 @@ ProcCreateGlyphCursor (register ClientPtr client)
&pCursor, client);
if (res != Success)
return res;
if (AddResource(stuff->cid, RT_CURSOR, (pointer)pCursor))
if (AddResource(stuff->cid, RT_CURSOR, (void *)pCursor))
return client->noClientException;
return BadAlloc;
}
......@@ -3311,10 +3311,10 @@ ProcChangeHosts(register ClientPtr client)
if(stuff->mode == HostInsert)
result = AddHost(client, (int)stuff->hostFamily,
stuff->hostLength, (pointer)&stuff[1]);
stuff->hostLength, (void *)&stuff[1]);
else if (stuff->mode == HostDelete)
result = RemoveHost(client, (int)stuff->hostFamily,
stuff->hostLength, (pointer)&stuff[1]);
stuff->hostLength, (void *)&stuff[1]);
else
{
client->errorValue = stuff->mode;
......@@ -3330,7 +3330,7 @@ ProcListHosts(register ClientPtr client)
{
xListHostsReply reply;
int len, nHosts, result;
pointer pdata;
void * pdata;
/* REQUEST(xListHostsReq); */
REQUEST_SIZE_MATCH(xListHostsReq);
......@@ -3582,7 +3582,7 @@ CloseDownClient(register ClientPtr client)
clientinfo.client = client;
clientinfo.prefix = (xConnSetupPrefix *)NULL;
clientinfo.setup = (xConnSetup *) NULL;
CallCallbacks((&ClientStateCallback), (pointer)&clientinfo);
CallCallbacks((&ClientStateCallback), (void *)&clientinfo);
}
}
client->clientGone = TRUE; /* so events aren't sent to client */
......@@ -3619,7 +3619,7 @@ CloseDownClient(register ClientPtr client)
clientinfo.client = client;
clientinfo.prefix = (xConnSetupPrefix *)NULL;
clientinfo.setup = (xConnSetup *) NULL;
CallCallbacks((&ClientStateCallback), (pointer)&clientinfo);
CallCallbacks((&ClientStateCallback), (void *)&clientinfo);
}
FreeClientResources(client);
if (client->index < nextFreeClientID)
......@@ -3669,7 +3669,7 @@ CloseDownRetainedResources()
}
}
void InitClient(ClientPtr client, int i, pointer ospriv)
void InitClient(ClientPtr client, int i, void * ospriv)
{
client->index = i;
client->sequence = 0;
......@@ -3759,11 +3759,11 @@ InitClientPrivates(ClientPtr client)
{
if ( (size = *sizes) )
{
ppriv->ptr = (pointer)ptr;
ppriv->ptr = (void *)ptr;
ptr += size;
}
else
ppriv->ptr = (pointer)NULL;
ppriv->ptr = (void *)NULL;
}
return 1;
}
......@@ -3775,7 +3775,7 @@ InitClientPrivates(ClientPtr client)
* Returns NULL if there are no free clients.
*************************/
ClientPtr NextAvailableClient(pointer ospriv)
ClientPtr NextAvailableClient(void * ospriv)
{
register int i;
register ClientPtr client;
......@@ -3813,7 +3813,7 @@ ClientPtr NextAvailableClient(pointer ospriv)
clientinfo.client = client;
clientinfo.prefix = (xConnSetupPrefix *)NULL;
clientinfo.setup = (xConnSetup *) NULL;
CallCallbacks((&ClientStateCallback), (pointer)&clientinfo);
CallCallbacks((&ClientStateCallback), (void *)&clientinfo);
}
return(client);
}
......@@ -3948,7 +3948,7 @@ SendConnSetup(register ClientPtr client, char *reason)
clientinfo.client = client;
clientinfo.prefix = lconnSetupPrefix;
clientinfo.setup = (xConnSetup *)lConnectionInfo;
CallCallbacks((&ClientStateCallback), (pointer)&clientinfo);
CallCallbacks((&ClientStateCallback), (void *)&clientinfo);
}
return (client->noClientException);
}
......
nx-X11/programs/Xserver/dix/dixfonts.c
View file @ 68dd0b52
......@@ -144,7 +144,7 @@ _NXGetFontPathError:
#define QUERYCHARINFO(pci, pr) *(pr) = (pci)->metrics
extern pointer fosNaturalParams;
extern void * fosNaturalParams;
extern FontPtr defaultFont;
static FontPathElementPtr *font_path_elements = (FontPathElementPtr *) 0;
......@@ -258,7 +258,7 @@ RemoveFontWakeup(FontPathElementPtr fpe)
}
void
FontWakeup(pointer data, int count, pointer LastSelectMask)
FontWakeup(void * data, int count, void * LastSelectMask)
{
int i;
FontPathElementPtr fpe;
......@@ -338,7 +338,7 @@ doOpenFont(ClientPtr client, OFclosurePtr c)
if (c->current_fpe < c->num_fpes)
{
fpe = c->fpe_list[c->current_fpe];
(*fpe_functions[fpe->type].client_died) ((pointer) client, fpe);
(*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
}
err = Successful;
goto bail;
......@@ -346,7 +346,7 @@ doOpenFont(ClientPtr client, OFclosurePtr c)
while (c->current_fpe < c->num_fpes) {
fpe = c->fpe_list[c->current_fpe];
err = (*fpe_functions[fpe->type].open_font)
((pointer) client, fpe, c->flags,
((void *) client, fpe, c->flags,
c->fontname, c->fnamelen, FontFormat,
BitmapFormatMaskByte |
BitmapFormatMaskBit |
......@@ -380,7 +380,7 @@ doOpenFont(ClientPtr client, OFclosurePtr c)
if (err == Suspended) {
if (!c->slept) {
c->slept = TRUE;
ClientSleep(client, (ClientSleepProcPtr)doOpenFont, (pointer) c);
ClientSleep(client, (ClientSleepProcPtr)doOpenFont, (void *) c);
}
return TRUE;
}
......@@ -418,7 +418,7 @@ doOpenFont(ClientPtr client, OFclosurePtr c)
}
}
}
if (!AddResource(c->fontid, RT_FONT, (pointer) pfont)) {
if (!AddResource(c->fontid, RT_FONT, (void *) pfont)) {
err = AllocError;
goto bail;
}
......@@ -481,7 +481,7 @@ OpenFont(ClientPtr client, XID fid, Mask flags, unsigned lenfname, char *pfontna
cached = FindCachedFontPattern(patternCache, pfontname, lenfname);
if (cached && cached->info.cachable)
{
if (!AddResource(fid, RT_FONT, (pointer) cached))
if (!AddResource(fid, RT_FONT, (void *) cached))
return BadAlloc;
cached->refcnt++;
return Success;
......@@ -532,7 +532,7 @@ OpenFont(ClientPtr client, XID fid, Mask flags, unsigned lenfname, char *pfontna
* \param value must conform to DeleteType
*/
int
CloseFont(pointer value, XID fid)
CloseFont(void * value, XID fid)
{
int nscr;
ScreenPtr pscr;
......@@ -660,7 +660,7 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
if (c->current.current_fpe < c->num_fpes)
{
fpe = c->fpe_list[c->current.current_fpe];
(*fpe_functions[fpe->type].client_died) ((pointer) client, fpe);
(*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
}
err = Successful;
goto bail;
......@@ -678,7 +678,7 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
/* This FPE doesn't support/require list_fonts_and_aliases */
err = (*fpe_functions[fpe->type].list_fonts)
((pointer) c->client, fpe, c->current.pattern,
((void *) c->client, fpe, c->current.pattern,
c->current.patlen, c->current.max_names - c->names->nnames,
c->names);
......@@ -687,7 +687,7 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
c->slept = TRUE;
ClientSleep(client,
(ClientSleepProcPtr)doListFontsAndAliases,
(pointer) c);
(void *) c);
}
return TRUE;
}
......@@ -707,14 +707,14 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
if (!c->current.list_started) {
err = (*fpe_functions[fpe->type].start_list_fonts_and_aliases)
((pointer) c->client, fpe, c->current.pattern,
((void *) c->client, fpe, c->current.pattern,
c->current.patlen, c->current.max_names - c->names->nnames,
&c->current.private);
if (err == Suspended) {
if (!c->slept) {
ClientSleep(client,
(ClientSleepProcPtr)doListFontsAndAliases,
(pointer) c);
(void *) c);
c->slept = TRUE;
}
return TRUE;
......@@ -726,13 +726,13 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
char *tmpname;
name = 0;
err = (*fpe_functions[fpe->type].list_next_font_or_alias)
((pointer) c->client, fpe, &name, &namelen, &tmpname,
((void *) c->client, fpe, &name, &namelen, &tmpname,
&resolvedlen, c->current.private);
if (err == Suspended) {
if (!c->slept) {
ClientSleep(client,
(ClientSleepProcPtr)doListFontsAndAliases,
(pointer) c);
(void *) c);
c->slept = TRUE;
}
return TRUE;
......@@ -780,7 +780,7 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
tmpname = 0;
(void) (*fpe_functions[fpe->type].list_next_font_or_alias)
((pointer) c->client, fpe, &tmpname, &tmpnamelen,
((void *) c->client, fpe, &tmpname, &tmpnamelen,
&tmpname, &tmpnamelen, c->current.private);
if (--aliascount <= 0)
{
......@@ -968,7 +968,7 @@ doListFontsWithInfo(ClientPtr client, LFWIclosurePtr c)
if (c->current.current_fpe < c->num_fpes)
{
fpe = c->fpe_list[c->current.current_fpe];
(*fpe_functions[fpe->type].client_died) ((pointer) client, fpe);
(*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
}
err = Successful;
goto bail;
......@@ -1237,7 +1237,7 @@ doPolyText(ClientPtr client, register PTclosurePtr c)
if (client->clientGone)
{
fpe = c->pGC->font->fpe;
(*fpe_functions[fpe->type].client_died) ((pointer) client, fpe);
(*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
if (c->slept)
{
......@@ -1265,7 +1265,7 @@ doPolyText(ClientPtr client, register PTclosurePtr c)
the FPE code to clean up after client and avoid further
rendering while we clean up after ourself. */
fpe = c->pGC->font->fpe;
(*fpe_functions[fpe->type].client_died) ((pointer) client, fpe);
(*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
c->pDraw = (DrawablePtr)0;
}
......@@ -1429,7 +1429,7 @@ doPolyText(ClientPtr client, register PTclosurePtr c)
c->slept = TRUE;
ClientSleep(client,
(ClientSleepProcPtr)doPolyText,
(pointer) c);
(void *) c);
/* Set up to perform steps 3 and 4 */
client_state = START_SLEEP;
......@@ -1535,7 +1535,7 @@ doImageText(ClientPtr client, register ITclosurePtr c)
if (client->clientGone)
{
fpe = c->pGC->font->fpe;
(*fpe_functions[fpe->type].client_died) ((pointer) client, fpe);
(*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
err = Success;
goto bail;
}
......@@ -1549,7 +1549,7 @@ doImageText(ClientPtr client, register ITclosurePtr c)
/* Our drawable has disappeared. Treat like client died... ask
the FPE code to clean up after client. */
fpe = c->pGC->font->fpe;
(*fpe_functions[fpe->type].client_died) ((pointer) client, fpe);
(*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
err = Success;
goto bail;
}
......@@ -1616,7 +1616,7 @@ doImageText(ClientPtr client, register ITclosurePtr c)
ValidateGC(c->pDraw, c->pGC);
c->slept = TRUE;
ClientSleep(client, (ClientSleepProcPtr)doImageText, (pointer) c);
ClientSleep(client, (ClientSleepProcPtr)doImageText, (void *) c);
}
return TRUE;
}
......@@ -1966,7 +1966,7 @@ DeleteClientFontStuff(ClientPtr client)
{
fpe = font_path_elements[i];
if (fpe_functions[fpe->type].client_died)
(*fpe_functions[fpe->type].client_died) ((pointer) client, fpe);
(*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
}
}
......@@ -2106,7 +2106,7 @@ GetNewFontClientID()
int
StoreFontClientFont(FontPtr pfont, Font id)
{
return AddResource(id, RT_NONE, (pointer) pfont);
return AddResource(id, RT_NONE, (void *) pfont);
}
void
......@@ -2139,7 +2139,7 @@ init_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler)
#endif
if (!RegisterBlockAndWakeupHandlers(block_handler,
FontWakeup, (pointer) 0))
FontWakeup, (void *) 0))
return AllocError;
fs_handlers_installed++;
}
......@@ -2159,7 +2159,7 @@ remove_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler, Bo
#endif
RemoveBlockAndWakeupHandlers(block_handler, FontWakeup,
(pointer) 0);
(void *) 0);
}
}
RemoveFontWakeup(fpe);
......@@ -2190,7 +2190,7 @@ dump_char_ascii(CharInfoPtr cip)
bpr = GLYPH_SIZE(cip, 4);
for (r = 0; r < (cip->metrics.ascent + cip->metrics.descent); r++) {
pointer row = (pointer) cip->bits + r * bpr;
void * row = (void *) cip->bits + r * bpr;
byte = 0;
for (l = 0; l <= (cip->metrics.rightSideBearing -
......
nx-X11/programs/Xserver/dix/dixutils.c
View file @ 68dd0b52
......@@ -236,23 +236,23 @@ SecurityLookupWindow(XID rid, ClientPtr client, Mask access_mode)
}
pointer
void *
SecurityLookupDrawable(XID rid, ClientPtr client, Mask access_mode)
{
register DrawablePtr pDraw;
if(rid == INVALID)
return (pointer) NULL;
return (void *) NULL;
if (client->trustLevel != XSecurityClientTrusted)
return (DrawablePtr)SecurityLookupIDByClass(client, rid, RC_DRAWABLE,
access_mode);
if (client->lastDrawableID == rid)
return ((pointer) client->lastDrawable);
return ((void *) client->lastDrawable);
pDraw = (DrawablePtr)SecurityLookupIDByClass(client, rid, RC_DRAWABLE,
access_mode);
if (pDraw && (pDraw->type != UNDRAWABLE_WINDOW))
return (pointer)pDraw;
return (pointer)NULL;
return (void *)pDraw;
return (void *)NULL;
}
/* We can't replace the LookupWindow and LookupDrawable functions with
......@@ -265,7 +265,7 @@ LookupWindow(XID rid, ClientPtr client)
return SecurityLookupWindow(rid, client, SecurityUnknownAccess);
}
pointer
void *
LookupDrawable(XID rid, ClientPtr client)
{
return SecurityLookupDrawable(rid, client, SecurityUnknownAccess);
......@@ -298,19 +298,19 @@ LookupWindow(XID rid, ClientPtr client)
}
pointer
void *
LookupDrawable(XID rid, ClientPtr client)
{
register DrawablePtr pDraw;
if(rid == INVALID)
return (pointer) NULL;
return (void *) NULL;
if (client->lastDrawableID == rid)
return ((pointer) client->lastDrawable);
return ((void *) client->lastDrawable);
pDraw = (DrawablePtr)LookupIDByClass(rid, RC_DRAWABLE);
if (pDraw && (pDraw->type != UNDRAWABLE_WINDOW))
return (pointer)pDraw;
return (pointer)NULL;
return (void *)pDraw;
return (void *)NULL;
}
#endif /* XCSECURITY */
......@@ -318,7 +318,7 @@ LookupDrawable(XID rid, ClientPtr client)
ClientPtr
LookupClient(XID rid, ClientPtr client)
{
pointer pRes = (pointer)SecurityLookupIDByClass(client, rid, RC_ANY,
void * pRes = (void *)SecurityLookupIDByClass(client, rid, RC_ANY,
SecurityReadAccess);
int clientIndex = CLIENT_ID(rid);
......@@ -343,7 +343,7 @@ AlterSaveSetForClient(ClientPtr client, WindowPtr pWin, unsigned mode,
if (numnow)
{
pTmp = client->saveSet;
while ((j < numnow) && (SaveSetWindow(pTmp[j]) != (pointer)pWin))
while ((j < numnow) && (SaveSetWindow(pTmp[j]) != (void *)pWin))
j++;
}
if (mode == SetModeInsert)
......@@ -413,7 +413,7 @@ NoopDDA(void)
typedef struct _BlockHandler {
BlockHandlerProcPtr BlockHandler;
WakeupHandlerProcPtr WakeupHandler;
pointer blockData;
void * blockData;
Bool deleted;
} BlockHandlerRec, *BlockHandlerPtr;
......@@ -429,7 +429,7 @@ static Bool handlerDeleted;
* \param pReadMask nor how it represents the det of descriptors
*/
void
BlockHandler(pointer pTimeout, pointer pReadmask)
BlockHandler(void * pTimeout, void * pReadmask)
{
register int i, j;
......@@ -463,7 +463,7 @@ BlockHandler(pointer pTimeout, pointer pReadmask)
* \param pReadmask the resulting descriptor mask
*/
void
WakeupHandler(int result, pointer pReadmask)
WakeupHandler(int result, void * pReadmask)
{
register int i, j;
......@@ -498,7 +498,7 @@ WakeupHandler(int result, pointer pReadmask)
Bool
RegisterBlockAndWakeupHandlers (BlockHandlerProcPtr blockHandler,
WakeupHandlerProcPtr wakeupHandler,
pointer blockData)
void * blockData)
{
BlockHandlerPtr new;
......@@ -522,7 +522,7 @@ RegisterBlockAndWakeupHandlers (BlockHandlerProcPtr blockHandler,
void
RemoveBlockAndWakeupHandlers (BlockHandlerProcPtr blockHandler,
WakeupHandlerProcPtr wakeupHandler,
pointer blockData)
void * blockData)
{
int i;
......@@ -616,8 +616,8 @@ ProcessWorkQueueZombies(void)
Bool
QueueWorkProc (
Bool (*function)(ClientPtr /* pClient */, pointer /* closure */),
ClientPtr client, pointer closure)
Bool (*function)(ClientPtr /* pClient */, void * /* closure */),
ClientPtr client, void * closure)
{
WorkQueuePtr q;
......@@ -645,13 +645,13 @@ typedef struct _SleepQueue {
struct _SleepQueue *next;
ClientPtr client;
ClientSleepProcPtr function;
pointer closure;
void * closure;
} SleepQueueRec, *SleepQueuePtr;
static SleepQueuePtr sleepQueue = NULL;
Bool
ClientSleep (ClientPtr client, ClientSleepProcPtr function, pointer closure)
ClientSleep (ClientPtr client, ClientSleepProcPtr function, void * closure)
{
SleepQueuePtr q;
......@@ -731,7 +731,7 @@ static Bool
_AddCallback(
CallbackListPtr *pcbl,
CallbackProcPtr callback,
pointer data)
void *data)
{
CallbackPtr cbr;
......@@ -750,7 +750,7 @@ static Bool
_DeleteCallback(
CallbackListPtr *pcbl,
CallbackProcPtr callback,
pointer data)
void *data)
{
CallbackListPtr cbl = *pcbl;
CallbackPtr cbr, pcbr;
......@@ -785,7 +785,7 @@ _DeleteCallback(
static void
_CallCallbacks(
CallbackListPtr *pcbl,
pointer call_data)
void *call_data)
{
CallbackListPtr cbl = *pcbl;
CallbackPtr cbr, pcbr;
......@@ -914,7 +914,7 @@ CreateCallbackList(CallbackListPtr *pcbl, CallbackFuncsPtr cbfuncs)
}
Bool
AddCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, pointer data)
AddCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, void * data)
{
if (!pcbl) return FALSE;
if (!*pcbl)
......@@ -926,14 +926,14 @@ AddCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, pointer data)
}
Bool
DeleteCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, pointer data)
DeleteCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, void * data)
{
if (!pcbl || !*pcbl) return FALSE;
return ((*(*pcbl)->funcs.DeleteCallback) (pcbl, callback, data));
}
void
CallCallbacks(CallbackListPtr *pcbl, pointer call_data)
CallCallbacks(CallbackListPtr *pcbl, void * call_data)
{
if (!pcbl || !*pcbl) return;
(*(*pcbl)->funcs.CallCallbacks) (pcbl, call_data);
......
nx-X11/programs/Xserver/dix/events.c
View file @ 68dd0b52
......@@ -1079,7 +1079,7 @@ EnqueueEvent(xEvent *xE, DeviceIntPtr device, int count)
WindowTable[sprite.hotPhys.pScreen->myNum]->drawable.id;
eventinfo.events = xE;
eventinfo.count = count;
CallCallbacks(&DeviceEventCallback, (pointer)&eventinfo);
CallCallbacks(&DeviceEventCallback, (void *)&eventinfo);
}
if (xE->u.u.type == MotionNotify)
{
......@@ -2587,7 +2587,7 @@ CheckPassiveGrabsOnWindow(
a passive grab to be activated. If the event is a keyboard event, the
ancestors of the focus window are traced down and tried to see if they have
any passive grabs to be activated. If the focus window itself is reached and
it's descendants contain they pointer, the ancestors of the window that the
its descendants contain the pointer, the ancestors of the window that the
pointer is in are then traced down starting at the focus window, otherwise no
grabs are activated. If the event is a pointer event, the ancestors of the
window that the pointer is in are traced down starting at the root until
......@@ -2812,7 +2812,7 @@ drawable.id:0;
DeviceEventInfoRec eventinfo;
eventinfo.events = xE;
eventinfo.count = count;
CallCallbacks(&DeviceEventCallback, (pointer)&eventinfo);
CallCallbacks(&DeviceEventCallback, (void *)&eventinfo);
}
}
#ifdef XEVIE
......@@ -2998,7 +2998,7 @@ ProcessPointerEvent (register xEvent *xE, register DeviceIntPtr mouse, int count
WindowTable[sprite.hotPhys.pScreen->myNum]->drawable.id;
eventinfo.events = xE;
eventinfo.count = count;
CallCallbacks(&DeviceEventCallback, (pointer)&eventinfo);
CallCallbacks(&DeviceEventCallback, (void *)&eventinfo);
}
}
if (xE->u.u.type != MotionNotify)
......@@ -3111,7 +3111,7 @@ RecalculateDeliverableEvents(pWin)
* \param value must conform to DeleteType
*/
int
OtherClientGone(pointer value, XID id)
OtherClientGone(void * value, XID id)
{
register OtherClientsPtr other, prev;
register WindowPtr pWin = (WindowPtr)value;
......@@ -3206,7 +3206,7 @@ EventSelectForWindow(register WindowPtr pWin, register ClientPtr client, Mask ma
others->resource = FakeClientID(client->index);
others->next = pWin->optional->otherClients;
pWin->optional->otherClients = others;
if (!AddResource(others->resource, RT_OTHERCLIENT, (pointer)pWin))
if (!AddResource(others->resource, RT_OTHERCLIENT, (void *)pWin))
return BadAlloc;
}
maskSet:
......@@ -4653,7 +4653,7 @@ WriteEventsToClient(ClientPtr pClient, int count, xEvent *events)
eventinfo.client = pClient;
eventinfo.events = events;
eventinfo.count = count;
CallCallbacks(&EventCallback, (pointer)&eventinfo);
CallCallbacks(&EventCallback, (void *)&eventinfo);
}
if(pClient->swapped)
{
......
nx-X11/programs/Xserver/dix/gc.c
View file @ 68dd0b52
......@@ -442,7 +442,7 @@ dixChangeGC(ClientPtr client, register GC *pGC, register BITS32 mask, CARD32 *pC
if(error == Success)
{
(*pGC->funcs->ChangeClip)(pGC, clipType,
(pointer)pPixmap, 0);
(void *)pPixmap, 0);
}
break;
}
......@@ -534,7 +534,7 @@ ChangeGC(register GC *pGC, register BITS32 mask, XID *pval)
pval contains an appropriate value for each mask.
fPointer is true if the values for tiles, stipples, fonts or clipmasks
are pointers instead of IDs. Note: if you are passing pointers you
MUST declare the array of values as type pointer! Other data types
MUST declare the array of values as type void*! Other data types
may not be large enough to hold pointers on some machines. Yes,
this means you have to cast to (XID *) when you pass the array to
DoChangeGC. Similarly, if you are not passing pointers (fPointer = 0) you
......@@ -591,11 +591,11 @@ AllocateGC(ScreenPtr pScreen)
{
if ( (size = *sizes) )
{
ppriv->ptr = (pointer)ptr;
ppriv->ptr = (void *)ptr;
ptr += size;
}
else
ppriv->ptr = (pointer)NULL;
ppriv->ptr = (void *)NULL;
}
}
return pGC;
......@@ -651,7 +651,7 @@ CreateGC(DrawablePtr pDrawable, BITS32 mask, XID *pval, int *pStatus)
pGC->clipOrg.x = 0;
pGC->clipOrg.y = 0;
pGC->clientClipType = CT_NONE;
pGC->clientClip = (pointer)NULL;
pGC->clientClip = (void *)NULL;
pGC->numInDashList = 2;
pGC->dash = DefaultDash;
pGC->dashOffset = 0;
......@@ -890,7 +890,7 @@ CopyGC(register GC *pgcSrc, register GC *pgcDst, register BITS32 mask)
* \param value must conform to DeleteType
*/
int
FreeGC(pointer value, XID gid)
FreeGC(void * value, XID gid)
{
GCPtr pGC = (GCPtr)value;
......@@ -1208,7 +1208,7 @@ SetClipRects(GCPtr pGC, int xOrigin, int yOrigin, int nrects,
if (size)
memmove((char *)prectsNew, (char *)prects, size);
(*pGC->funcs->ChangeClip)(pGC, newct, (pointer)prectsNew, nrects);
(*pGC->funcs->ChangeClip)(pGC, newct, (void *)prectsNew, nrects);
if (pGC->funcs->ChangeGC)
(*pGC->funcs->ChangeGC) (pGC, GCClipXOrigin|GCClipYOrigin|GCClipMask);
return Success;
......
nx-X11/programs/Xserver/dix/glyphcurs.c
View file @ 68dd0b52
......@@ -119,7 +119,7 @@ ServerBitsFromGlyph(FontPtr pfont, unsigned ch, register CursorMetricPtr cm, uns
/* fill the pixmap with 0 */
gcval[0].val = GXcopy;
gcval[1].val = 0;
gcval[2].ptr = (pointer)pfont;
gcval[2].ptr = (void *)pfont;
dixChangeGC(NullClient, pGC, GCFunction | GCForeground | GCFont,
NULL, gcval);
ValidateGC((DrawablePtr)ppix, pGC);
......
nx-X11/programs/Xserver/dix/grabs.c
View file @ 68dd0b52
......@@ -128,7 +128,7 @@ FreeGrab(GrabPtr pGrab)
}
int
DeletePassiveGrab(pointer value, XID id)
DeletePassiveGrab(void * value, XID id)
{
register GrabPtr g, prev;
GrabPtr pGrab = (GrabPtr)value;
......@@ -295,7 +295,7 @@ AddPassiveGrabToList(GrabPtr pGrab)
}
pGrab->next = pGrab->window->optional->passiveGrabs;
pGrab->window->optional->passiveGrabs = pGrab;
if (AddResource(pGrab->resource, RT_PASSIVEGRAB, (pointer)pGrab))
if (AddResource(pGrab->resource, RT_PASSIVEGRAB, (void *)pGrab))
return Success;
return BadAlloc;
}
......@@ -389,7 +389,7 @@ DeletePassiveGrabFromList(GrabPtr pMinuendGrab)
ok = FALSE;
}
else if (!AddResource(pNewGrab->resource, RT_PASSIVEGRAB,
(pointer)pNewGrab))
(void *)pNewGrab))
ok = FALSE;
else
adds[nadds++] = pNewGrab;
......
nx-X11/programs/Xserver/dix/main.c
View file @ 68dd0b52
......@@ -319,7 +319,7 @@ main(int argc, char *argv[], char *envp[])
serverClient = (ClientPtr)xalloc(sizeof(ClientRec));
if (!serverClient)
FatalError("couldn't create server client");
InitClient(serverClient, 0, (pointer)NULL);
InitClient(serverClient, 0, (void *)NULL);
}
else
ResetWellKnownSockets ();
......
nx-X11/programs/Xserver/dix/pixmap.c
View file @ 68dd0b52
......@@ -53,7 +53,7 @@ from The Open Group.
/* callable by ddx */
PixmapPtr
GetScratchPixmapHeader(ScreenPtr pScreen, int width, int height, int depth,
int bitsPerPixel, int devKind, pointer pPixData)
int bitsPerPixel, int devKind, void * pPixData)
{
PixmapPtr pPixmap = pScreen->pScratchPixmap;
......@@ -139,11 +139,11 @@ AllocatePixmap(ScreenPtr pScreen, int pixDataSize)
{
if ((size = *sizes) != 0)
{
ppriv->ptr = (pointer)ptr;
ppriv->ptr = (void *)ptr;
ptr += size;
}
else
ppriv->ptr = (pointer)NULL;
ppriv->ptr = (void *)NULL;
}
#else
pPixmap = (PixmapPtr)xalloc(sizeof(PixmapRec) + pixDataSize);
......
nx-X11/programs/Xserver/dix/property.c
View file @ 68dd0b52
......@@ -263,10 +263,10 @@ ProcChangeProperty(ClientPtr client)
#ifdef LBX
err = LbxChangeWindowProperty(client, pWin, stuff->property, stuff->type,
(int)format, (int)mode, len, TRUE, (pointer)&stuff[1], TRUE, NULL);
(int)format, (int)mode, len, TRUE, (void *)&stuff[1], TRUE, NULL);
#else
err = ChangeWindowProperty(pWin, stuff->property, stuff->type, (int)format,
(int)mode, len, (pointer)&stuff[1], TRUE);
(int)mode, len, (void *)&stuff[1], TRUE);
#endif
if (err != Success)
return err;
......@@ -276,7 +276,7 @@ ProcChangeProperty(ClientPtr client)
int
ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format,
int mode, unsigned long len, pointer value,
int mode, unsigned long len, void * value,
Bool sendevent)
{
#ifdef LBX
......@@ -288,7 +288,7 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format,
xEvent event;
int sizeInBytes;
int totalSize;
pointer data;
void * data;
sizeInBytes = format>>3;
totalSize = len * sizeInBytes;
......@@ -309,7 +309,7 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format,
pProp = (PropertyPtr)xalloc(sizeof(PropertyRec));
if (!pProp)
return(BadAlloc);
data = (pointer)xalloc(totalSize);
data = (void *)xalloc(totalSize);
if (!data && len)
{
xfree(pProp);
......@@ -340,7 +340,7 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format,
{
if (totalSize != pProp->size * (pProp->format >> 3))
{
data = (pointer)xrealloc(pProp->data, totalSize);
data = (void *)xrealloc(pProp->data, totalSize);
if (!data && len)
return(BadAlloc);
pProp->data = data;
......@@ -357,7 +357,7 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format,
}
else if (mode == PropModeAppend)
{
data = (pointer)xrealloc(pProp->data,
data = (void *)xrealloc(pProp->data,
sizeInBytes * (len + pProp->size));
if (!data)
return(BadAlloc);
......@@ -369,7 +369,7 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format,
}
else if (mode == PropModePrepend)
{
data = (pointer)xalloc(sizeInBytes * (len + pProp->size));
data = (void *)xalloc(sizeInBytes * (len + pProp->size));
if (!data)
return(BadAlloc);
memmove(&((char *)data)[totalSize], (char *)pProp->data,
......
nx-X11/programs/Xserver/dix/resource.c
View file @ 68dd0b52
......@@ -139,7 +139,7 @@ typedef struct _Resource {
struct _Resource *next;
XID id;
RESTYPE type;
pointer value;
void * value;
} ResourceRec, *ResourcePtr;
#define NullResource ((ResourcePtr)NULL)
......@@ -423,7 +423,7 @@ FakeClientID(register int client)
}
Bool
AddResource(XID id, RESTYPE type, pointer value)
AddResource(XID id, RESTYPE type, void * value)
{
int client;
register ClientResourceRec *rrec;
......@@ -595,7 +595,7 @@ FreeResourceByType(XID id, RESTYPE type, Bool skipFree)
*/
Bool
ChangeResourceValue (XID id, RESTYPE rtype, pointer value)
ChangeResourceValue (XID id, RESTYPE rtype, void * value)
{
int cid;
register ResourcePtr res;
......@@ -627,7 +627,7 @@ FindClientResourcesByType(
ClientPtr client,
RESTYPE type,
FindResType func,
pointer cdata
void * cdata
){
register ResourcePtr *resources;
register ResourcePtr this, next;
......@@ -658,7 +658,7 @@ void
FindAllClientResources(
ClientPtr client,
FindAllRes func,
pointer cdata
void * cdata
){
register ResourcePtr *resources;
register ResourcePtr this, next;
......@@ -684,12 +684,12 @@ FindAllClientResources(
}
pointer
void *
LookupClientResourceComplex(
ClientPtr client,
RESTYPE type,
FindComplexResType func,
pointer cdata
void * cdata
){
ResourcePtr *resources;
ResourcePtr this;
......@@ -831,12 +831,12 @@ LegalNewID(XID id, register ClientPtr client)
* else NULL is returned.
*/
pointer
void *
SecurityLookupIDByType(ClientPtr client, XID id, RESTYPE rtype, Mask mode)
{
int cid;
register ResourcePtr res;
pointer retval = NULL;
void * retval = NULL;
assert(client == NullClient ||
(client->index <= currentMaxClients && clients[client->index] == client));
......@@ -860,12 +860,12 @@ SecurityLookupIDByType(ClientPtr client, XID id, RESTYPE rtype, Mask mode)
}
pointer
void *
SecurityLookupIDByClass(ClientPtr client, XID id, RESTYPE classes, Mask mode)
{
int cid;
register ResourcePtr res = NULL;
pointer retval = NULL;
void * retval = NULL;
assert(client == NullClient ||
(client->index <= currentMaxClients && clients[client->index] == client));
......@@ -892,14 +892,14 @@ SecurityLookupIDByClass(ClientPtr client, XID id, RESTYPE classes, Mask mode)
* macros because of compatibility with loadable servers.
*/
pointer
void *
LookupIDByType(XID id, RESTYPE rtype)
{
return SecurityLookupIDByType(NullClient, id, rtype,
SecurityUnknownAccess);
}
pointer
void *
LookupIDByClass(XID id, RESTYPE classes)
{
return SecurityLookupIDByClass(NullClient, id, classes,
......@@ -911,7 +911,7 @@ LookupIDByClass(XID id, RESTYPE classes)
/*
* LookupIDByType returns the object with the given id and type, else NULL.
*/
pointer
void *
LookupIDByType(XID id, RESTYPE rtype)
{
int cid;
......@@ -926,14 +926,14 @@ LookupIDByType(XID id, RESTYPE rtype)
if ((res->id == id) && (res->type == rtype))
return res->value;
}
return (pointer)NULL;
return (void *)NULL;
}
/*
* LookupIDByClass returns the object with the given id and any one of the
* given classes, else NULL.
*/
pointer
void *
LookupIDByClass(XID id, RESTYPE classes)
{
int cid;
......@@ -948,7 +948,7 @@ LookupIDByClass(XID id, RESTYPE classes)
if ((res->id == id) && (res->type & classes))
return res->value;
}
return (pointer)NULL;
return (void *)NULL;
}
#endif /* XCSECURITY */
nx-X11/programs/Xserver/dix/window.c
View file @ 68dd0b52
......@@ -203,7 +203,7 @@ PrintWindowTree()
#endif
int
TraverseTree(register WindowPtr pWin, VisitWindowProcPtr func, pointer data)
TraverseTree(register WindowPtr pWin, VisitWindowProcPtr func, void * data)
{
register int result;
register WindowPtr pChild;
......@@ -238,7 +238,7 @@ TraverseTree(register WindowPtr pWin, VisitWindowProcPtr func, pointer data)
*****/
int
WalkTree(ScreenPtr pScreen, VisitWindowProcPtr func, pointer data)
WalkTree(ScreenPtr pScreen, VisitWindowProcPtr func, void * data)
{
return(TraverseTree(WindowTable[pScreen->myNum], func, data));
}
......@@ -264,7 +264,7 @@ SetWindowToDefaults(register WindowPtr pWin)
pWin->backingStore = NotUseful;
pWin->DIXsaveUnder = FALSE;
pWin->backStorage = (pointer) NULL;
pWin->backStorage = (void *) NULL;
pWin->mapped = FALSE; /* off */
pWin->realized = FALSE; /* off */
......@@ -356,11 +356,11 @@ AllocateWindow(ScreenPtr pScreen)
{
if ( (size = *sizes) )
{
ppriv->ptr = (pointer)ptr;
ppriv->ptr = (void *)ptr;
ptr += size;
}
else
ppriv->ptr = (pointer)NULL;
ppriv->ptr = (void *)NULL;
}
}
return pWin;
......@@ -454,7 +454,7 @@ CreateRootWindow(ScreenPtr pScreen)
pWin->border.pixel = pScreen->blackPixel;
pWin->borderWidth = 0;
if (!AddResource(pWin->drawable.id, RT_WINDOW, (pointer)pWin))
if (!AddResource(pWin->drawable.id, RT_WINDOW, (void *)pWin))
return FALSE;
if (disableBackingStore)
......@@ -879,7 +879,7 @@ CrushTree(WindowPtr pWin)
*****/
int
DeleteWindow(pointer value, XID wid)
DeleteWindow(void * value, XID wid)
{
register WindowPtr pParent;
register WindowPtr pWin = (WindowPtr)value;
......@@ -2525,7 +2525,7 @@ CirculateWindow(WindowPtr pParent, int direction, ClientPtr client)
static int
CompareWIDs(
WindowPtr pWin,
pointer value) /* must conform to VisitWindowProcPtr */
void * value) /* must conform to VisitWindowProcPtr */
{
Window *wid = (Window *)value;
......@@ -2550,7 +2550,7 @@ ReparentWindow(register WindowPtr pWin, register WindowPtr pParent,
register ScreenPtr pScreen;
pScreen = pWin->drawable.pScreen;
if (TraverseTree(pWin, CompareWIDs, (pointer)&pParent->drawable.id) == WT_STOPWALKING)
if (TraverseTree(pWin, CompareWIDs, (void *)&pParent->drawable.id) == WT_STOPWALKING)
return(BadMatch);
if (!MakeWindowOptional(pWin))
return(BadAlloc);
......@@ -3483,7 +3483,7 @@ TileScreenSaver(int i, int kind)
if (cursor)
{
cursorID = FakeClientID(0);
if (AddResource (cursorID, RT_CURSOR, (pointer) cursor))
if (AddResource (cursorID, RT_CURSOR, (void *) cursor))
{
attributes[attri] = cursorID;
mask |= CWCursor;
......@@ -3514,7 +3514,7 @@ TileScreenSaver(int i, int kind)
return FALSE;
if (!AddResource(pWin->drawable.id, RT_WINDOW,
(pointer)savedScreenInfo[i].pWindow))
(void *)savedScreenInfo[i].pWindow))
return FALSE;
if (mask & CWBackPixmap)
......
nx-X11/programs/Xserver/fb/fb.h
View file @ 68dd0b52
......@@ -795,7 +795,7 @@ fb24_32ModifyPixmapHeader (PixmapPtr pPixmap,
int depth,
int bitsPerPixel,
int devKind,
pointer pPixData);
void *pPixData);
/*
* fballpriv.c
......@@ -1486,7 +1486,7 @@ fbPolyGlyphBlt (DrawablePtr pDrawable,
int y,
unsigned int nglyph,
CharInfoPtr *ppci,
pointer pglyphBase);
void *pglyphBase);
void
fbImageGlyphBlt (DrawablePtr pDrawable,
......@@ -1495,7 +1495,7 @@ fbImageGlyphBlt (DrawablePtr pDrawable,
int y,
unsigned int nglyph,
CharInfoPtr *ppci,
pointer pglyphBase);
void *pglyphBase);
/*
* fbimage.c
......@@ -1732,7 +1732,7 @@ _fbSetWindowPixmap (WindowPtr pWindow, PixmapPtr pPixmap);
Bool
fbSetupScreen(ScreenPtr pScreen,
pointer pbits, /* pointer to screen bitmap */
void *pbits, /* pointer to screen bitmap */
int xsize, /* in pixels */
int ysize,
int dpix, /* dots per inch */
......@@ -1742,7 +1742,7 @@ fbSetupScreen(ScreenPtr pScreen,
Bool
fbFinishScreenInit(ScreenPtr pScreen,
pointer pbits,
void *pbits,
int xsize,
int ysize,
int dpix,
......@@ -1752,7 +1752,7 @@ fbFinishScreenInit(ScreenPtr pScreen,
Bool
fbScreenInit(ScreenPtr pScreen,
pointer pbits,
void *pbits,
int xsize,
int ysize,
int dpix,
......
nx-X11/programs/Xserver/fb/fb24_32.c
View file @ 68dd0b52
......@@ -571,7 +571,7 @@ fb24_32ReformatTile(PixmapPtr pOldTile, int bitsPerPixel)
}
typedef struct {
pointer pbits;
void * pbits;
int width;
} miScreenInitParmsRec, *miScreenInitParmsPtr;
......@@ -603,7 +603,7 @@ fb24_32ModifyPixmapHeader (PixmapPtr pPixmap,
int depth,
int bitsPerPixel,
int devKind,
pointer pPixData)
void *pPixData)
{
int bpp, w;
......
nx-X11/programs/Xserver/fb/fb24_32.h
View file @ 68dd0b52
......@@ -32,7 +32,7 @@
Bool
fb24_32FinishScreenInit(ScreenPtr pScreen,
pointer pbits,
void *pbits,
int xsize,
int ysize,
int dpix,
......@@ -42,7 +42,7 @@ fb24_32FinishScreenInit(ScreenPtr pScreen,
Bool
fb24_32ScreenInit(ScreenPtr pScreen,
pointer pbits,
void *pbits,
int xsize,
int ysize,
int dpix,
......
nx-X11/programs/Xserver/fb/fballpriv.c
View file @ 68dd0b52
......@@ -86,7 +86,7 @@ fbAllocatePrivates(ScreenPtr pScreen, int *pGCIndex)
pScreenPriv = (FbScreenPrivPtr) xalloc (sizeof (FbScreenPrivRec));
if (!pScreenPriv)
return FALSE;
pScreen->devPrivates[fbScreenPrivateIndex].ptr = (pointer) pScreenPriv;
pScreen->devPrivates[fbScreenPrivateIndex].ptr = (void *) pScreenPriv;
}
#endif
return TRUE;
......
nx-X11/programs/Xserver/fb/fbglyph.c
View file @ 68dd0b52
......@@ -262,7 +262,7 @@ fbPolyGlyphBlt (DrawablePtr pDrawable,
int y,
unsigned int nglyph,
CharInfoPtr *ppci,
pointer pglyphBase)
void * pglyphBase)
{
FbGCPrivPtr pPriv = fbGetGCPrivate (pGC);
CharInfoPtr pci;
......@@ -350,7 +350,7 @@ fbImageGlyphBlt (DrawablePtr pDrawable,
int y,
unsigned int nglyph,
CharInfoPtr *ppciInit,
pointer pglyphBase)
void * pglyphBase)
{
FbGCPrivPtr pPriv = fbGetGCPrivate(pGC);
CharInfoPtr *ppci;
......
nx-X11/programs/Xserver/fb/fboverlay.c
View file @ 68dd0b52
......@@ -64,7 +64,7 @@ fbOverlayCreateWindow(WindowPtr pWin)
pPixmap = pScrPriv->layer[i].u.run.pixmap;
if (pWin->drawable.depth == pPixmap->drawable.depth)
{
pWin->devPrivates[fbWinPrivateIndex].ptr = (pointer) pPixmap;
pWin->devPrivates[fbWinPrivateIndex].ptr = (void *) pPixmap;
/*
* Make sure layer keys are written correctly by
* having non-root layers set to full while the
......@@ -108,7 +108,7 @@ fbOverlayWindowLayer(WindowPtr pWin)
for (i = 0; i < pScrPriv->nlayers; i++)
if (pWin->devPrivates[fbWinPrivateIndex].ptr ==
(pointer) pScrPriv->layer[i].u.run.pixmap)
(void *) pScrPriv->layer[i].u.run.pixmap)
return i;
return 0;
}
......@@ -119,7 +119,7 @@ fbOverlayCreateScreenResources(ScreenPtr pScreen)
int i;
FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pScreen);
PixmapPtr pPixmap;
pointer pbits;
void * pbits;
int width;
int depth;
BoxRec box;
......@@ -289,8 +289,8 @@ fbOverlayPaintWindow(WindowPtr pWin, RegionPtr pRegion, int what)
Bool
fbOverlaySetupScreen(ScreenPtr pScreen,
pointer pbits1,
pointer pbits2,
void * pbits1,
void * pbits2,
int xsize,
int ysize,
int dpix,
......@@ -336,8 +336,8 @@ fb24_32OverlayCreateScreenResources(ScreenPtr pScreen)
Bool
fbOverlayFinishScreenInit(ScreenPtr pScreen,
pointer pbits1,
pointer pbits2,
void * pbits1,
void * pbits2,
int xsize,
int ysize,
int dpix,
......@@ -436,7 +436,7 @@ fbOverlayFinishScreenInit(ScreenPtr pScreen,
pScrPriv->layer[1].u.init.width = width2;
pScrPriv->layer[1].u.init.depth = depth2;
pScreen->devPrivates[fbOverlayScreenPrivateIndex].ptr = (pointer) pScrPriv;
pScreen->devPrivates[fbOverlayScreenPrivateIndex].ptr = (void *) pScrPriv;
/* overwrite miCloseScreen with our own */
pScreen->CloseScreen = fbOverlayCloseScreen;
......
nx-X11/programs/Xserver/fb/fboverlay.h
View file @ 68dd0b52
......@@ -39,7 +39,7 @@ typedef void (*fbOverlayPaintKeyProc) (DrawablePtr, RegionPtr, CARD32, int);
typedef struct _fbOverlayLayer {
union {
struct {
pointer pbits;
void * pbits;
int width;
int depth;
} init;
......@@ -100,8 +100,8 @@ fbOverlayPaintWindow(WindowPtr pWin, RegionPtr pRegion, int what);
Bool
fbOverlaySetupScreen(ScreenPtr pScreen,
pointer pbits1,
pointer pbits2,
void * pbits1,
void * pbits2,
int xsize,
int ysize,
int dpix,
......@@ -113,8 +113,8 @@ fbOverlaySetupScreen(ScreenPtr pScreen,
Bool
fbOverlayFinishScreenInit(ScreenPtr pScreen,
pointer pbits1,
pointer pbits2,
void * pbits1,
void * pbits2,
int xsize,
int ysize,
int dpix,
......
nx-X11/programs/Xserver/fb/fbpixmap.c
View file @ 68dd0b52
......@@ -73,7 +73,7 @@ fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp)
pPixmap->drawable.height = height;
pPixmap->devKind = paddedWidth;
pPixmap->refcnt = 1;
pPixmap->devPrivate.ptr = (pointer) ((char *)pPixmap + base + adjust);
pPixmap->devPrivate.ptr = (void *) ((char *)pPixmap + base + adjust);
#ifdef FB_DEBUG
pPixmap->devPrivate.ptr = (void *) ((char *) pPixmap->devPrivate.ptr + paddedWidth);
fbInitializeDrawable (&pPixmap->drawable);
......
nx-X11/programs/Xserver/fb/fbpseudocolor.c
View file @ 68dd0b52
......@@ -20,7 +20,7 @@ static void xxValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDraw);
static void xxDestroyGC(GCPtr pGC);
static void xxChangeGC (GCPtr pGC, unsigned long mask);
static void xxCopyGC (GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst);
static void xxChangeClip (GCPtr pGC, int type, pointer pvalue, int nrects);
static void xxChangeClip (GCPtr pGC, int type, void * pvalue, int nrects);
static void xxCopyClip(GCPtr pgcDst, GCPtr pgcSrc);
static void xxDestroyClip(GCPtr pGC);
......@@ -63,10 +63,10 @@ static void xxImageText16(DrawablePtr pDraw, GCPtr pGC, int x, int y,
int count, unsigned short *chars);
static void xxImageGlyphBlt(DrawablePtr pDraw, GCPtr pGC, int x, int y,
unsigned int nglyph, CharInfoPtr *ppci,
pointer pglyphBase);
void * pglyphBase);
static void xxPolyGlyphBlt(DrawablePtr pDraw, GCPtr pGC, int x, int y,
unsigned int nglyph, CharInfoPtr *ppci,
pointer pglyphBase);
void * pglyphBase);
static void xxPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDraw,
int dx, int dy, int xOrg, int yOrg);
static void
......@@ -108,7 +108,7 @@ typedef struct {
#endif
PixmapPtr pPixmap;
char * addr;
pointer pBits;
void *pBits;
RegionRec region;
VisualPtr bVisual;
RegionRec bRegion;
......@@ -200,7 +200,7 @@ xxUpdateWindowImmediately(WindowPtr pWin)
pmap = (ColormapPtr)LookupIDByType(wColormap(pWin),RT_COLORMAP);
if (pmap && (pCmapPriv = xxGetCmapPriv(pmap)) != (pointer)-1) {
if (pmap && (pCmapPriv = xxGetCmapPriv(pmap)) != (void *)-1) {
xxCopyPseudocolorRegion(pWin->drawable.pScreen,
&pScrPriv->region, pCmapPriv);
}
......@@ -259,7 +259,7 @@ xxCreateScreenResources(ScreenPtr pScreen)
PixmapPtr pPixmap;
BoxRec box;
int depth = pScrPriv->myDepth;
pointer pBits;
void *pBits;
unwrap (pScrPriv,pScreen, CreateScreenResources);
ret = pScreen->CreateScreenResources(pScreen);
......@@ -364,16 +364,16 @@ xxInitColormapPrivate(ColormapPtr pmap)
{
xxScrPriv(pmap->pScreen);
xxCmapPrivPtr pCmapPriv;
pointer cmap;
void *cmap;
pmap->devPrivates[xxColormapPrivateIndex].ptr = (pointer) -1;
pmap->devPrivates[xxColormapPrivateIndex].ptr = (void *) -1;
if (xxMyVisual(pmap->pScreen,pmap->pVisual->vid)) {
DBG("CreateColormap\n");
pCmapPriv = (xxCmapPrivPtr) xalloc (sizeof (xxCmapPrivRec));
if (!pCmapPriv)
return FALSE;
pmap->devPrivates[xxColormapPrivateIndex].ptr = (pointer) pCmapPriv;
pmap->devPrivates[xxColormapPrivateIndex].ptr = (void *) pCmapPriv;
cmap = xalloc(sizeof (CARD32) * (1 << pScrPriv->myDepth));
if (!cmap)
return FALSE;
......@@ -437,7 +437,7 @@ xxDestroyColormap(ColormapPtr pmap)
xxScrPriv(pmap->pScreen);
xxCmapPriv(pmap);
if (pCmapPriv != (pointer) -1) {
if (pCmapPriv != (void *) -1) {
xxCmapPrivPtr tmpCmapPriv = pScrPriv->Cmaps;
xxCmapPrivPtr *prevCmapPriv = &pScrPriv->Cmaps;
int n;
......@@ -489,7 +489,7 @@ xxStoreColors(ColormapPtr pmap, int nColors, xColorItem *pColors)
xxScrPriv(pmap->pScreen);
xxCmapPriv(pmap);
if (pCmapPriv != (pointer) -1) {
if (pCmapPriv != (void *) -1) {
xColorItem *expanddefs;
int i;
......@@ -547,7 +547,7 @@ xxInstallColormap(ColormapPtr pmap)
xxScrPriv(pmap->pScreen);
xxCmapPriv(pmap);
if (pCmapPriv != (pointer) -1) {
if (pCmapPriv != (void *) -1) {
Pixel *pixels;
xrgb *colors;
int i;
......@@ -619,7 +619,7 @@ xxUninstallColormap(ColormapPtr pmap)
xxScrPriv(pmap->pScreen);
xxCmapPriv(pmap);
if (pCmapPriv != (pointer) -1) {
if (pCmapPriv != (void *) -1) {
int num;
if ((num = xxCmapInstalled(pmap)) == -1)
......@@ -675,7 +675,7 @@ xxCreateWindow(WindowPtr pWin)
DBG("CreateWindow\n");
pWin->devPrivates[fbWinPrivateIndex].ptr = (pointer) pScrPriv->pPixmap;
pWin->devPrivates[fbWinPrivateIndex].ptr = (void *) pScrPriv->pPixmap;
PRINT_RECTS(pScrPriv->region);
if (!pWin->parent) {
REGION_EMPTY (pWin->drawable.pScreen, &pScrPriv->region);
......@@ -962,15 +962,15 @@ xxGetWindowRegion(WindowPtr pWin,RegionPtr winreg)
}
static int
xxUpdateRegion(WindowPtr pWin, pointer unused)
xxUpdateRegion(WindowPtr pWin, void * unused)
{
ScreenPtr pScreen = pWin->drawable.pScreen;
xxScrPriv(pScreen);
ColormapPtr pmap = (pointer) -1;
ColormapPtr pmap = (void *) -1;
RegionRec winreg, rgni;
if (pScrPriv->myDepth == pWin->drawable.depth) {
xxCmapPrivPtr pCmapPriv = (pointer)-1;
xxCmapPrivPtr pCmapPriv = (void *)-1;
xxGetWindowRegion(pWin,&winreg);
if (pScrPriv->colormapDirty) {
......@@ -980,7 +980,7 @@ xxUpdateRegion(WindowPtr pWin, pointer unused)
goto CONTINUE; /* return ? */
pCmapPriv = xxGetCmapPriv(pmap);
if (pCmapPriv == (pointer) -1)
if (pCmapPriv == (void *) -1)
return WT_WALKCHILDREN;
if (!pCmapPriv->dirty)
goto CONTINUE;
......@@ -997,7 +997,7 @@ xxUpdateRegion(WindowPtr pWin, pointer unused)
REGION_INTERSECT (pScreen, &rgni, &winreg, &pScrPriv->region);
if (REGION_NOTEMPTY (pScreen,&rgni)) {
if (pmap == (pointer) -1) {
if (pmap == (void *) -1) {
pmap =
(ColormapPtr)LookupIDByType(wColormap(pWin),RT_COLORMAP);
if (!pmap) /* return ? */
......@@ -1006,7 +1006,7 @@ xxUpdateRegion(WindowPtr pWin, pointer unused)
pCmapPriv = xxGetCmapPriv(pmap);
}
if (pCmapPriv != (pointer)-1)
if (pCmapPriv != (void *)-1)
xxCopyPseudocolorRegion(pScreen,&rgni, pCmapPriv);
REGION_SUBTRACT(pScreen, &pScrPriv->region, &pScrPriv->region,
&rgni);
......@@ -1034,13 +1034,13 @@ xxUpdateFb(ScreenPtr pScreen)
WalkTree(pScreen,xxUpdateRegion,NULL);
#if 0
if (REGION_NOTEMPTY (pScreen,&pScrPriv->region)) {
ColormapPtr pmap = (pointer) -1;
ColormapPtr pmap = (void *) -1;
xxCmapPrivPtr pCmapPriv;
pmap = (ColormapPtr)LookupIDByType(pScreen->defColormap,
RT_COLORMAP);
pCmapPriv = xxGetCmapPriv(pmap);
if (pCmapPriv != (pointer)-1)
if (pCmapPriv != (void *)-1)
xxCopyPseudocolorRegion(pScreen,&pScrPriv->region, pCmapPriv);
REGION_SUBTRACT(pScreen, &pScrPriv->region, &pScrPriv->region,
&pScrPriv->region);
......@@ -1064,9 +1064,9 @@ xxUpdateFb(ScreenPtr pScreen)
}
static void
xxBlockHandler (pointer data,
xxBlockHandler (void * data,
OSTimePtr pTimeout,
pointer pRead)
void * pRead)
{
ScreenPtr pScreen = (ScreenPtr) data;
xxScrPriv(pScreen);
......@@ -1076,7 +1076,7 @@ xxBlockHandler (pointer data,
}
static void
xxWakeupHandler (pointer data, int i, pointer LastSelectMask)
xxWakeupHandler (void * data, int i, void * LastSelectMask)
{
}
......@@ -1158,7 +1158,7 @@ xxSetup(ScreenPtr pScreen, int myDepth, int baseDepth, char* addr, xxSyncFunc sy
if (!RegisterBlockAndWakeupHandlers (xxBlockHandler,
xxWakeupHandler,
(pointer) pScreen))
(void *) pScreen))
return FALSE;
wrap (pScrPriv, pScreen, CloseScreen, xxCloseScreen);
......@@ -1184,7 +1184,7 @@ xxSetup(ScreenPtr pScreen, int myDepth, int baseDepth, char* addr, xxSyncFunc sy
}
#endif
pScrPriv->addr = addr;
pScreen->devPrivates[xxScrPrivateIndex].ptr = (pointer) pScrPriv;
pScreen->devPrivates[xxScrPrivateIndex].ptr = (void *) pScrPriv;
pDefMap = (ColormapPtr) LookupIDByType(pScreen->defColormap, RT_COLORMAP);
if (!xxInitColormapPrivate(pDefMap))
......@@ -1341,7 +1341,7 @@ static void
xxChangeClip (
GCPtr pGC,
int type,
pointer pvalue,
void * pvalue,
int nrects
){
XX_GC_FUNC_PROLOGUE (pGC);
......@@ -2114,7 +2114,7 @@ xxImageGlyphBlt(
int x, int y,
unsigned int nglyph,
CharInfoPtr *ppci,
pointer pglyphBase
void * pglyphBase
){
XX_GC_OP_PROLOGUE(pGC, pDraw);
(*pGC->ops->ImageGlyphBlt)(pDraw, pGC, x, y, nglyph,
......@@ -2162,7 +2162,7 @@ xxPolyGlyphBlt(
int x, int y,
unsigned int nglyph,
CharInfoPtr *ppci,
pointer pglyphBase
void * pglyphBase
){
XX_GC_OP_PROLOGUE(pGC, pDraw);
(*pGC->ops->PolyGlyphBlt)(pDraw, pGC, x, y, nglyph,
......
nx-X11/programs/Xserver/fb/fbscreen.c
View file @ 68dd0b52
......@@ -97,14 +97,14 @@ _fbSetWindowPixmap (WindowPtr pWindow, PixmapPtr pPixmap)
#ifdef FB_NO_WINDOW_PIXMAPS
FatalError ("Attempted to set window pixmap without fb support\n");
#else
pWindow->devPrivates[fbWinPrivateIndex].ptr = (pointer) pPixmap;
pWindow->devPrivates[fbWinPrivateIndex].ptr = (void *) pPixmap;
#endif
}
#endif
Bool
fbSetupScreen(ScreenPtr pScreen,
pointer pbits, /* pointer to screen bitmap */
void * pbits, /* pointer to screen bitmap */
int xsize, /* in pixels */
int ysize,
int dpix, /* dots per inch */
......@@ -160,7 +160,7 @@ fbSetupScreen(ScreenPtr pScreen,
Bool
fbFinishScreenInit(ScreenPtr pScreen,
pointer pbits,
void * pbits,
int xsize,
int ysize,
int dpix,
......@@ -261,7 +261,7 @@ fbFinishScreenInit(ScreenPtr pScreen,
/* dts * (inch/dot) * (25.4 mm / inch) = mm */
Bool
fbScreenInit(ScreenPtr pScreen,
pointer pbits,
void * pbits,
int xsize,
int ysize,
int dpix,
......
nx-X11/programs/Xserver/fb/fbwindow.c
View file @ 68dd0b52
......@@ -38,7 +38,7 @@ fbCreateWindow(WindowPtr pWin)
{
#ifndef FB_NO_WINDOW_PIXMAPS
pWin->devPrivates[fbWinPrivateIndex].ptr =
(pointer) fbGetScreenPixmap(pWin->drawable.pScreen);
(void *) fbGetScreenPixmap(pWin->drawable.pScreen);
#endif
#ifdef FB_SCREEN_PRIVATE
if (pWin->drawable.bitsPerPixel == 32)
......
nx-X11/programs/Xserver/hw/nxagent/Colormap.c
View file @ 68dd0b52
......@@ -77,7 +77,7 @@ Bool nxagentCreateColormap(ColormapPtr pCmap)
pVisual = pCmap->pVisual;
ncolors = pVisual->ColormapEntries;
pCmap->devPriv = (pointer)xalloc(sizeof(nxagentPrivColormap));
pCmap->devPriv = (void *)xalloc(sizeof(nxagentPrivColormap));
if (((visual = nxagentVisual(pVisual))) == NULL)
{
......@@ -174,7 +174,7 @@ void nxagentDestroyColormap(ColormapPtr pCmap)
#define SEARCH_PREDICATE \
(nxagentWindow(pWin) != None && wColormap(pWin) == icws->cmapIDs[i])
static int nxagentCountInstalledColormapWindows(WindowPtr pWin, pointer ptr)
static int nxagentCountInstalledColormapWindows(WindowPtr pWin, void * ptr)
{
nxagentInstalledColormapWindows *icws = (nxagentInstalledColormapWindows *) ptr;
......@@ -189,7 +189,7 @@ static int nxagentCountInstalledColormapWindows(WindowPtr pWin, pointer ptr)
return WT_WALKCHILDREN;
}
static int nxagentGetInstalledColormapWindows(WindowPtr pWin, pointer ptr)
static int nxagentGetInstalledColormapWindows(WindowPtr pWin, void * ptr)
{
nxagentInstalledColormapWindows *icws = (nxagentInstalledColormapWindows *)ptr;
int i;
......@@ -233,11 +233,11 @@ void nxagentSetInstalledColormapWindows(ScreenPtr pScreen)
sizeof(Colormap));
icws.numCmapIDs = nxagentListInstalledColormaps(pScreen, icws.cmapIDs);
icws.numWindows = 0;
WalkTree(pScreen, nxagentCountInstalledColormapWindows, (pointer)&icws);
WalkTree(pScreen, nxagentCountInstalledColormapWindows, (void *)&icws);
if (icws.numWindows) {
icws.windows = (Window *)xalloc((icws.numWindows + 1) * sizeof(Window));
icws.index = 0;
WalkTree(pScreen, nxagentGetInstalledColormapWindows, (pointer)&icws);
WalkTree(pScreen, nxagentGetInstalledColormapWindows, (void *)&icws);
icws.windows[icws.numWindows] = nxagentDefaultWindows[pScreen->myNum];
numWindows = icws.numWindows + 1;
}
......@@ -388,10 +388,10 @@ void nxagentInstallColormap(ColormapPtr pCmap)
/* Uninstall pInstalledMap. Notify all interested parties. */
if(pOldCmap != (ColormapPtr)None)
WalkTree(pCmap->pScreen, TellLostMap, (pointer)&pOldCmap->mid);
WalkTree(pCmap->pScreen, TellLostMap, (void *)&pOldCmap->mid);
InstalledMaps[index] = pCmap;
WalkTree(pCmap->pScreen, TellGainedMap, (pointer)&pCmap->mid);
WalkTree(pCmap->pScreen, TellGainedMap, (void *)&pCmap->mid);
nxagentSetInstalledColormapWindows(pCmap->pScreen);
nxagentDirectInstallColormaps(pCmap->pScreen);
......@@ -542,7 +542,7 @@ Bool nxagentCreateDefaultColormap(ScreenPtr pScreen)
return True;
}
static void nxagentReconnectColormap(pointer p0, XID x1, pointer p2)
static void nxagentReconnectColormap(void * p0, XID x1, void * p2)
{
ColormapPtr pCmap = (ColormapPtr)p0;
Bool* pBool = (Bool*)p2;
......
nx-X11/programs/Xserver/hw/nxagent/Cursor.c
View file @ 68dd0b52
......@@ -231,7 +231,7 @@ Bool nxagentRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor)
bg_color.green = pCursor->backGreen;
bg_color.blue = pCursor->backBlue;
pCursor->devPriv[pScreen->myNum] = (pointer) xalloc(sizeof(nxagentPrivCursor));
pCursor->devPriv[pScreen->myNum] = (void *) xalloc(sizeof(nxagentPrivCursor));
nxagentCursorPriv(pCursor, pScreen)->cursor =
XCreatePixmapCursor(nxagentDisplay, source, mask, &fg_color,
......@@ -311,7 +311,7 @@ Bool nxagentSetCursorPosition(ScreenPtr pScreen, int x, int y,
}
}
void nxagentReconnectCursor(pointer p0, XID x1, pointer p2)
void nxagentReconnectCursor(void * p0, XID x1, void * p2)
{
Bool* pBool = (Bool*)p2;
CursorPtr pCursor = (CursorPtr) p0;
......@@ -433,7 +433,7 @@ Bool nxagentReconnectAllCursor(void *p0)
return r;
}
void nxagentDisconnectCursor(pointer p0, XID x1, pointer p2)
void nxagentDisconnectCursor(void * p0, XID x1, void * p2)
{
Bool* pBool = (Bool *) p2;
CursorPtr pCursor = (CursorPtr) p0;
......
nx-X11/programs/Xserver/hw/nxagent/Cursor.h
View file @ 68dd0b52
......@@ -100,8 +100,8 @@ Bool nxagentSetCursorPosition(ScreenPtr pScreen, int x, int y,
extern Bool (*nxagentSetCursorPositionW)(ScreenPtr pScreen, int x, int y,
Bool generateEvent);
void nxagentDisconnectCursor(pointer p0, XID x1, pointer p2);
void nxagentReconnectCursor(pointer p0, XID x1, pointer p2);
void nxagentDisconnectCursor(void * p0, XID x1, void * p2);
void nxagentReconnectCursor(void * p0, XID x1, void * p2);
void nxagentReDisplayCurrentCursor(void);
Bool nxagentReconnectAllCursor(void *p0);
Bool nxagentDisconnectAllCursor(void);
......
nx-X11/programs/Xserver/hw/nxagent/Drawable.c
View file @ 68dd0b52
......@@ -106,7 +106,7 @@ void nxagentExposeBackgroundPredicate(void *p0, XID x1, void *p2);
* Imported from NXresource.c
*/
extern int nxagentFindClientResource(int, RESTYPE, pointer);
extern int nxagentFindClientResource(int, RESTYPE, void *);
unsigned long nxagentGetColor(DrawablePtr pDrawable, int xPixel, int yPixel);
unsigned long nxagentGetDrawableColor(DrawablePtr pDrawable);
......@@ -2391,7 +2391,7 @@ void nxagentFillRemoteRegion(DrawablePtr pDrawable, RegionPtr pRegion)
}
}
int nxagentDestroyCorruptedWindowResource(pointer p, XID id)
int nxagentDestroyCorruptedWindowResource(void * p, XID id)
{
#ifdef TEST
fprintf(stderr, "nxagentDestroyCorruptedWindowResource: Removing corrupted window [%p] from resources.\n",
......@@ -2403,7 +2403,7 @@ int nxagentDestroyCorruptedWindowResource(pointer p, XID id)
return 1;
}
int nxagentDestroyCorruptedPixmapResource(pointer p, XID id)
int nxagentDestroyCorruptedPixmapResource(void * p, XID id)
{
#ifdef TEST
fprintf(stderr, "nxagentDestroyCorruptedPixmapResource: Removing corrupted pixmap [%p] from resources.\n",
......@@ -2415,7 +2415,7 @@ int nxagentDestroyCorruptedPixmapResource(pointer p, XID id)
return 1;
}
int nxagentDestroyCorruptedBackgroundResource(pointer p, XID id)
int nxagentDestroyCorruptedBackgroundResource(void * p, XID id)
{
#ifdef TEST
fprintf(stderr, "nxagentDestroyCorruptedBackgroundResource: Removing corrupted pixmap background [%p] from resources.\n",
......@@ -2842,7 +2842,7 @@ void nxagentAllocateCorruptedResource(DrawablePtr pDrawable, RESTYPE type)
nxagentWindowPriv((WindowPtr) pDrawable) -> corruptedId = FakeClientID(serverClient -> index);
AddResource(nxagentWindowPriv((WindowPtr) pDrawable) -> corruptedId, RT_NX_CORR_WINDOW,
(pointer) pDrawable);
(void *) pDrawable);
}
}
else if (type == RT_NX_CORR_BACKGROUND)
......@@ -2869,7 +2869,7 @@ void nxagentAllocateCorruptedResource(DrawablePtr pDrawable, RESTYPE type)
nxagentPixmapPriv(pRealPixmap) -> corruptedBackgroundId = FakeClientID(serverClient -> index);
AddResource(nxagentPixmapPriv(pRealPixmap) -> corruptedBackgroundId, RT_NX_CORR_BACKGROUND,
(pointer) pRealPixmap);
(void *) pRealPixmap);
}
}
else if (type == RT_NX_CORR_PIXMAP)
......@@ -2896,7 +2896,7 @@ void nxagentAllocateCorruptedResource(DrawablePtr pDrawable, RESTYPE type)
nxagentPixmapPriv(pRealPixmap) -> corruptedId = FakeClientID(serverClient -> index);
AddResource(nxagentPixmapPriv(pRealPixmap) -> corruptedId, RT_NX_CORR_PIXMAP,
(pointer) pRealPixmap);
(void *) pRealPixmap);
}
}
}
......@@ -3204,7 +3204,7 @@ void nxagentExposeBackgroundPredicate(void *p0, XID x1, void *p2)
* This function is similar to nxagentClipAndSendExpose().
*/
int nxagentClipAndSendClearExpose(WindowPtr pWin, pointer ptr)
int nxagentClipAndSendClearExpose(WindowPtr pWin, void * ptr)
{
RegionPtr exposeRgn;
RegionPtr remoteExposeRgn;
......
nx-X11/programs/Xserver/hw/nxagent/Drawable.h
View file @ 68dd0b52
......@@ -182,9 +182,9 @@ extern void nxagentFillRemoteRegion(DrawablePtr pDrawable, RegionPtr pRegion);
extern void nxagentAllocateCorruptedResource(DrawablePtr pDrawable, RESTYPE type);
extern void nxagentDestroyCorruptedResource(DrawablePtr pDrawable, RESTYPE type);
extern int nxagentDestroyCorruptedBackgroundResource(pointer p, XID id);
extern int nxagentDestroyCorruptedWindowResource(pointer p, XID id);
extern int nxagentDestroyCorruptedPixmapResource(pointer p, XID id);
extern int nxagentDestroyCorruptedBackgroundResource(void * p, XID id);
extern int nxagentDestroyCorruptedWindowResource(void * p, XID id);
extern int nxagentDestroyCorruptedPixmapResource(void * p, XID id);
extern void nxagentCreateDrawableBitmap(DrawablePtr pDrawable);
extern void nxagentDestroyDrawableBitmap(DrawablePtr pDrawable);
......
nx-X11/programs/Xserver/hw/nxagent/Events.c
View file @ 68dd0b52
......@@ -218,7 +218,7 @@ RegionPtr nxagentRemoteExposeRegion = NULL;
static void nxagentForwardRemoteExpose(void);
static int nxagentClipAndSendExpose(WindowPtr pWin, pointer ptr);
static int nxagentClipAndSendExpose(WindowPtr pWin, void * ptr);
/*
* This is from NXproperty.c.
......@@ -778,7 +778,7 @@ void nxagentGetEventMask(WindowPtr pWin, Mask *mask_return)
*mask_return = mask;
}
static int nxagentChangeMapPrivate(WindowPtr pWin, pointer ptr)
static int nxagentChangeMapPrivate(WindowPtr pWin, void * ptr)
{
if (pWin && nxagentWindowPriv(pWin))
{
......@@ -788,7 +788,7 @@ static int nxagentChangeMapPrivate(WindowPtr pWin, pointer ptr)
return WT_WALKCHILDREN;
}
static int nxagentChangeVisibilityPrivate(WindowPtr pWin, pointer ptr)
static int nxagentChangeVisibilityPrivate(WindowPtr pWin, void * ptr)
{
if (pWin && nxagentWindowPriv(pWin))
{
......@@ -4276,7 +4276,7 @@ void nxagentAddRectToRemoteExposeRegion(BoxPtr rect)
REGION_UNINIT(nxagentDefaultScreen, &exposeRegion);
}
int nxagentClipAndSendExpose(WindowPtr pWin, pointer ptr)
int nxagentClipAndSendExpose(WindowPtr pWin, void * ptr)
{
RegionPtr exposeRgn;
RegionPtr remoteExposeRgn;
......
nx-X11/programs/Xserver/hw/nxagent/Font.c
View file @ 68dd0b52
......@@ -103,7 +103,7 @@ is" without express or implied warranty.
static int reconnectFlexibility;
static void nxagentCleanCacheAfterReconnect(void);
static void nxagentFontReconnect(FontPtr, XID, pointer);
static void nxagentFontReconnect(FontPtr, XID, void *);
static XFontStruct *nxagentLoadBestQueryFont(Display* dpy, char *fontName, FontPtr pFont);
static XFontStruct *nxagentLoadQueryFont(register Display *dpy , char *fontName , FontPtr pFont);
int nxagentFreeFont(XFontStruct *fs);
......@@ -486,7 +486,7 @@ Bool nxagentFontLookUp(const char *name)
Bool nxagentRealizeFont(ScreenPtr pScreen, FontPtr pFont)
{
pointer priv;
void * priv;
Atom name_atom, value_atom;
int nprops;
FontPropPtr props;
......@@ -538,7 +538,7 @@ Bool nxagentRealizeFont(ScreenPtr pScreen, FontPtr pFont)
name = origName;
}
priv = (pointer)xalloc(sizeof(nxagentPrivFont));
priv = (void *)xalloc(sizeof(nxagentPrivFont));
FontSetPrivate(pFont, nxagentFontPrivateIndex, priv);
nxagentFontPriv(pFont) -> mirrorID = 0;
......@@ -693,7 +693,7 @@ Bool nxagentUnrealizeFont(ScreenPtr pScreen, FontPtr pFont)
return True;
}
int nxagentDestroyNewFontResourceType(pointer p, XID id)
int nxagentDestroyNewFontResourceType(void * p, XID id)
{
#ifdef TEST
fprintf(stderr, "nxagentDestroyNewFontResourceType: Destroying mirror id [%ld] for font at [%p].\n",
......@@ -858,7 +858,7 @@ static XFontStruct *nxagentLoadBestQueryFont(Display* dpy, char *fontName, FontP
return fontStruct;
}
static void nxagentFontDisconnect(FontPtr pFont, XID param1, pointer param2)
static void nxagentFontDisconnect(FontPtr pFont, XID param1, void * param2)
{
nxagentPrivFont *privFont;
Bool *pBool = (Bool*)param2;
......@@ -959,7 +959,7 @@ static void nxagentCollectFailedFont(FontPtr fpt, XID id)
nxagentFailedToReconnectFonts.index++;
}
static void nxagentFontReconnect(FontPtr pFont, XID param1, pointer param2)
static void nxagentFontReconnect(FontPtr pFont, XID param1, void * param2)
{
int i;
nxagentPrivFont *privFont;
......@@ -1164,7 +1164,7 @@ Bool nxagentReconnectAllFonts(void *p0)
return fontSuccess;
}
static void nxagentFailedFontReconnect(FontPtr pFont, XID param1, pointer param2)
static void nxagentFailedFontReconnect(FontPtr pFont, XID param1, void * param2)
{
int i;
nxagentPrivFont *privFont;
......
nx-X11/programs/Xserver/hw/nxagent/Font.h
View file @ 68dd0b52
......@@ -65,7 +65,7 @@ int nxagentFontLookUp(const char *name);
Bool nxagentFontFind(const char *name, int *pos);
void nxagentListRemoteAddName(const char *name, int status);
int nxagentDestroyNewFontResourceType(pointer p, XID id);
int nxagentDestroyNewFontResourceType(void * p, XID id);
Bool nxagentDisconnectAllFonts(void);
Bool nxagentReconnectAllFonts(void *p0);
......
nx-X11/programs/Xserver/hw/nxagent/GC.c
View file @ 68dd0b52
......@@ -75,7 +75,7 @@ void nxagentDisconnectGraphicContexts(void);
GCPtr nxagentCreateGraphicContext(int depth);
static void nxagentReconnectGC(void*, XID, void*);
static void nxagentReconnectClip(GCPtr, int, pointer, int);
static void nxagentReconnectClip(GCPtr, int, void *, int);
static int nxagentCompareRegions(RegionPtr, RegionPtr);
struct nxagentGCRec
......@@ -198,7 +198,7 @@ Bool nxagentCreateGC(GCPtr pGC)
nxagentGCPriv(pGC) -> pPixmap = NULL;
AddResource(nxagentGCPriv(pGC) -> mid, RT_NX_GC, (pointer) pGC);
AddResource(nxagentGCPriv(pGC) -> mid, RT_NX_GC, (void *) pGC);
return True;
}
......@@ -602,7 +602,7 @@ void nxagentDestroyGC(GCPtr pGC)
miDestroyGC(pGC);
}
void nxagentChangeClip(GCPtr pGC, int type, pointer pValue, int nRects)
void nxagentChangeClip(GCPtr pGC, int type, void * pValue, int nRects)
{
int i, size;
BoxPtr pBox;
......@@ -699,7 +699,7 @@ void nxagentChangeClip(GCPtr pGC, int type, pointer pValue, int nRects)
nxagentPixmap((PixmapPtr)pValue));
}
pGC->clientClip = (pointer) (*pGC->pScreen->BitmapToRegion)((PixmapPtr) pValue);
pGC->clientClip = (void *) (*pGC->pScreen->BitmapToRegion)((PixmapPtr) pValue);
nxagentGCPriv(pGC)->pPixmap = (PixmapPtr)pValue;
......@@ -768,7 +768,7 @@ void nxagentChangeClip(GCPtr pGC, int type, pointer pValue, int nRects)
* CT_REGION client clips.
*/
pGC->clientClip = (pointer) RECTS_TO_REGION(pGC->pScreen, nRects,
pGC->clientClip = (void *) RECTS_TO_REGION(pGC->pScreen, nRects,
(xRectangle *)pValue, type);
xfree(pValue);
......@@ -987,7 +987,7 @@ static void nxagentRestoreGCList()
}
}
int nxagentDestroyNewGCResourceType(pointer p, XID id)
int nxagentDestroyNewGCResourceType(void * p, XID id)
{
/*
* Address of the destructor is set in Init.c.
......@@ -1003,7 +1003,7 @@ int nxagentDestroyNewGCResourceType(pointer p, XID id)
return 1;
}
static void nxagentReconnectGC(void *param0, XID param1, pointer param2)
static void nxagentReconnectGC(void *param0, XID param1, void * param2)
{
XGCValues values;
unsigned long valuemask;
......@@ -1188,7 +1188,7 @@ Bool nxagentReconnectAllGCs(void *p0)
return GCSuccess;
}
void nxagentDisconnectGC(pointer p0, XID x1, pointer p2)
void nxagentDisconnectGC(void * p0, XID x1, void * p2)
{
GCPtr pGC = (GCPtr) p0;
Bool* pBool = (Bool*) p2;
......@@ -1255,7 +1255,7 @@ Bool nxagentDisconnectAllGCs()
return success;
}
static void nxagentReconnectClip(GCPtr pGC, int type, pointer pValue, int nRects)
static void nxagentReconnectClip(GCPtr pGC, int type, void * pValue, int nRects)
{
int i, size;
BoxPtr pBox;
......@@ -1320,7 +1320,7 @@ static void nxagentReconnectClip(GCPtr pGC, int type, pointer pValue, int nRects
XSetClipOrigin(nxagentDisplay, nxagentGC(pGC), pGC -> clipOrg.x, pGC -> clipOrg.y);
pGC->clientClip = (pointer) (*pGC->pScreen->BitmapToRegion)((PixmapPtr) pValue);
pGC->clientClip = (void *) (*pGC->pScreen->BitmapToRegion)((PixmapPtr) pValue);
nxagentGCPriv(pGC)->pPixmap = (PixmapPtr)pValue;
......@@ -1370,7 +1370,7 @@ static void nxagentReconnectClip(GCPtr pGC, int type, pointer pValue, int nRects
* CT_PIXMAP and CT_REGION client clips.
*/
pGC->clientClip = (pointer) RECTS_TO_REGION(pGC->pScreen, nRects,
pGC->clientClip = (void *) RECTS_TO_REGION(pGC->pScreen, nRects,
(xRectangle *)pValue, type);
xfree(pValue);
pValue = pGC->clientClip;
......
nx-X11/programs/Xserver/hw/nxagent/GCOps.c
View file @ 68dd0b52
......@@ -2042,7 +2042,7 @@ void nxagentImageText16(DrawablePtr pDrawable, GCPtr pGC, int x,
void nxagentImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y,
unsigned int nGlyphs, CharInfoPtr *pCharInfo,
pointer pGlyphBase)
void * pGlyphBase)
{
if ((pDrawable)->type == DRAWABLE_PIXMAP)
{
......@@ -2061,7 +2061,7 @@ void nxagentImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y,
void nxagentPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y,
unsigned int nGlyphs, CharInfoPtr *pCharInfo,
pointer pGlyphBase)
void * pGlyphBase)
{
if ((pDrawable)->type == DRAWABLE_PIXMAP)
{
......
nx-X11/programs/Xserver/hw/nxagent/GCOps.h
View file @ 68dd0b52
......@@ -93,10 +93,10 @@ void nxagentImageText16(DrawablePtr pDrawable, GCPtr pGC, int x,
int y, int count, unsigned short *string);
void nxagentImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y,
unsigned int nGlyphs, CharInfoPtr *pCharInfo, pointer pGlyphBase);
unsigned int nGlyphs, CharInfoPtr *pCharInfo, void * pGlyphBase);
void nxagentPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y,
unsigned int nGlyphs, CharInfoPtr *pCharInfo, pointer pGlyphBase);
unsigned int nGlyphs, CharInfoPtr *pCharInfo, void * pGlyphBase);
void nxagentPushPixels(GCPtr pGC, PixmapPtr pBitmap, DrawablePtr pDrawable,
int width, int height, int x, int y);
......
nx-X11/programs/Xserver/hw/nxagent/GCs.h
View file @ 68dd0b52
......@@ -87,17 +87,17 @@ void nxagentValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable);
void nxagentChangeGC(GCPtr pGC, unsigned long mask);
void nxagentCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst);
void nxagentDestroyGC(GCPtr pGC);
void nxagentChangeClip(GCPtr pGC, int type, pointer pValue, int nRects);
void nxagentChangeClip(GCPtr pGC, int type, void * pValue, int nRects);
void nxagentDestroyClip(GCPtr pGC);
void nxagentDestroyClipHelper(GCPtr pGC);
void nxagentCopyClip(GCPtr pGCDst, GCPtr pGCSrc);
void nxagentDisconnectGC(pointer p0, XID x1, pointer p2);
void nxagentDisconnectGC(void * p0, XID x1, void * p2);
Bool nxagentDisconnectAllGCs(void);
Bool nxagentReconnectAllGCs(void *p0);
int nxagentDestroyNewGCResourceType(pointer p, XID id);
int nxagentDestroyNewGCResourceType(void * p, XID id);
void nxagentFreeGCList(void);
void nxagentInitGCSafeVector(void);
......
nx-X11/programs/Xserver/hw/nxagent/Handlers.c
View file @ 68dd0b52
......@@ -161,7 +161,7 @@ struct _DispatchRec nxagentDispatch = { UNDEFINED, 0, 0, 0 };
extern int nxagentSkipImage;
void nxagentBlockHandler(pointer data, struct timeval **timeout, pointer mask)
void nxagentBlockHandler(void * data, struct timeval **timeout, void * mask)
{
/*
* Zero timeout.
......@@ -569,7 +569,7 @@ void nxagentBlockHandler(pointer data, struct timeval **timeout, pointer mask)
#endif
}
void nxagentWakeupHandler(pointer data, int count, pointer mask)
void nxagentWakeupHandler(void * data, int count, void * mask)
{
#ifdef BLOCKS
fprintf(stderr, "[Begin wakeup]\n");
......@@ -723,7 +723,7 @@ void nxagentWakeupHandler(pointer data, int count, pointer mask)
#endif
}
void nxagentShadowBlockHandler(pointer data, struct timeval **timeout, pointer mask)
void nxagentShadowBlockHandler(void * data, struct timeval **timeout, void * mask)
{
static struct timeval zero;
......@@ -851,7 +851,7 @@ FIXME: Must queue multiple writes and handle
#endif
}
void nxagentShadowWakeupHandler(pointer data, int count, pointer mask)
void nxagentShadowWakeupHandler(void * data, int count, void * mask)
{
#ifdef BLOCKS
fprintf(stderr, "[Begin wakeup]\n");
......
nx-X11/programs/Xserver/hw/nxagent/Handlers.h
View file @ 68dd0b52
......@@ -100,8 +100,8 @@ extern struct _TokensRec nxagentTokens;
* The agent's block and wakeup handlers.
*/
void nxagentBlockHandler(pointer data, struct timeval **timeout, pointer mask);
void nxagentWakeupHandler(pointer data, int count, pointer mask);
void nxagentBlockHandler(void * data, struct timeval **timeout, void * mask);
void nxagentWakeupHandler(void * data, int count, void * mask);
/*
* Executed after each request processed.
......@@ -109,8 +109,8 @@ void nxagentWakeupHandler(pointer data, int count, pointer mask);
void nxagentDispatchHandler(ClientPtr client, int in, int out);
void nxagentShadowBlockHandler(pointer data, struct timeval **timeout, pointer mask);
void nxagentShadowWakeupHandler(pointer data, int count, pointer mask);
void nxagentShadowBlockHandler(void * data, struct timeval **timeout, void * mask);
void nxagentShadowWakeupHandler(void * data, int count, void * mask);
extern GCPtr nxagentShadowGCPtr;
extern unsigned char nxagentShadowDepth;
......
nx-X11/programs/Xserver/hw/nxagent/Init.c
View file @ 68dd0b52
......@@ -132,8 +132,8 @@ void OsVendorEndRedirectErrorFFunction();
*/
static void nxagentGrabServerCallback(CallbackListPtr *callbacks, pointer data,
pointer args);
static void nxagentGrabServerCallback(CallbackListPtr *callbacks, void *data,
void *args);
void ddxInitGlobals(void)
{
......@@ -398,7 +398,7 @@ void InitInput(argc, argv)
int argc;
char *argv[];
{
pointer ptr, kbd;
void *ptr, *kbd;
ptr = AddInputDevice(nxagentPointerProc, True);
kbd = AddInputDevice(nxagentKeyboardProc, True);
......@@ -530,8 +530,8 @@ int SelectWaitTime = 10000; /* usec */
ServerGrabInfoRec nxagentGrabServerInfo;
static void nxagentGrabServerCallback(CallbackListPtr *callbacks, pointer data,
pointer args)
static void nxagentGrabServerCallback(CallbackListPtr *callbacks, void *data,
void *args)
{
ServerGrabInfoRec *grab = (ServerGrabInfoRec*)args;
......
nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
View file @ 68dd0b52
......@@ -571,7 +571,7 @@ static char *nxagentXkbGetRules()
return XKB_DFLT_RULES_FILE;
}
void nxagentBell(int volume, DeviceIntPtr pDev, pointer ctrl, int cls)
void nxagentBell(int volume, DeviceIntPtr pDev, void * ctrl, int cls)
{
XBell(nxagentDisplay, volume);
}
......@@ -978,7 +978,7 @@ XkbError:
#endif
XkbSetRulesDflts(rules, model, layout, variants, options);
XkbInitKeyboardDeviceStruct((pointer)pDev, &names, &keySyms, modmap,
XkbInitKeyboardDeviceStruct((void *)pDev, &names, &keySyms, modmap,
nxagentBell, nxagentChangeKeyboardControl);
if (!nxagentKeyboard ||
......@@ -1068,7 +1068,7 @@ XkbError:
#endif
XkbSetRulesDflts(rules, model, layout, variants, options);
XkbInitKeyboardDeviceStruct((pointer)pDev, &names, &keySyms, modmap,
XkbInitKeyboardDeviceStruct((void *)pDev, &names, &keySyms, modmap,
nxagentBell, nxagentChangeKeyboardControl);
free(nxagentXkbConfigFilePath);
......@@ -1087,9 +1087,9 @@ XkbError:
#endif
XkbSetRulesDflts(rules, model, layout, variants, options);
XkbInitKeyboardDeviceStruct((pointer)pDev, &names, &keySyms, modmap,
XkbInitKeyboardDeviceStruct((void *)pDev, &names, &keySyms, modmap,
nxagentBell, nxagentChangeKeyboardControl);
XkbDDXChangeControls((pointer)pDev, xkb->ctrls, xkb->ctrls);
XkbDDXChangeControls((void *)pDev, xkb->ctrls, xkb->ctrls);
XkbEnd:
......
nx-X11/programs/Xserver/hw/nxagent/Keyboard.h
View file @ 68dd0b52
......@@ -89,7 +89,7 @@ extern char *nxagentKeyboard;
* and utility functions.
*/
void nxagentBell(int volume, DeviceIntPtr pDev, pointer ctrl, int cls);
void nxagentBell(int volume, DeviceIntPtr pDev, void * ctrl, int cls);
int nxagentKeyboardProc(DeviceIntPtr pDev, int onoff);
......
nx-X11/programs/Xserver/hw/nxagent/NXdamage.c
View file @ 68dd0b52
......@@ -344,7 +344,7 @@ static void damageValidateGC(GCPtr, unsigned long, DrawablePtr);
static void damageChangeGC(GCPtr, unsigned long);
static void damageCopyGC(GCPtr, unsigned long, GCPtr);
static void damageDestroyGC(GCPtr);
static void damageChangeClip(GCPtr, int, pointer, int);
static void damageChangeClip(GCPtr, int, void *, int);
static void damageDestroyClip(GCPtr);
static void damageCopyClip(GCPtr, GCPtr);
......@@ -457,7 +457,7 @@ damageCopyGC (GCPtr pGCSrc,
static void
damageChangeClip (GCPtr pGC,
int type,
pointer pvalue,
void *pvalue,
int nrects)
{
DAMAGE_GC_FUNC_PROLOGUE (pGC);
......@@ -1560,7 +1560,7 @@ damageImageGlyphBlt(DrawablePtr pDrawable,
int y,
unsigned int nglyph,
CharInfoPtr *ppci,
pointer pglyphBase)
void *pglyphBase)
{
DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
damageDamageChars (pDrawable, pGC->font, x + pDrawable->x, y + pDrawable->y,
......@@ -1577,7 +1577,7 @@ damagePolyGlyphBlt(DrawablePtr pDrawable,
int y,
unsigned int nglyph,
CharInfoPtr *ppci,
pointer pglyphBase)
void *pglyphBase)
{
DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
damageDamageChars (pDrawable, pGC->font, x + pDrawable->x, y + pDrawable->y,
......@@ -1908,7 +1908,7 @@ DamageSetup (ScreenPtr pScreen)
}
#endif
pScreen->devPrivates[damageScrPrivateIndex].ptr = (pointer) pScrPriv;
pScreen->devPrivates[damageScrPrivateIndex].ptr = (void *) pScrPriv;
return TRUE;
}
......
nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
View file @ 68dd0b52
......@@ -245,7 +245,7 @@ extern WindowPtr nxagentViewportFrameBelow;
extern int nxagentMaxAllowedResets;
extern int nxagentFindClientResource(int, RESTYPE, pointer);
extern int nxagentFindClientResource(int, RESTYPE, void *);
static ClientPtr grabClient;
#define GrabNone 0
......@@ -883,7 +883,7 @@ ProcCreateWindow(ClientPtr client)
Mask mask = pWin->eventMask;
pWin->eventMask = 0; /* subterfuge in case AddResource fails */
if (!AddResource(stuff->wid, RT_WINDOW, (pointer)pWin))
if (!AddResource(stuff->wid, RT_WINDOW, (void *)pWin))
return BadAlloc;
pWin->eventMask = mask;
}
......@@ -1573,7 +1573,7 @@ ProcGrabServer(register ClientPtr client)
ServerGrabInfoRec grabinfo;
grabinfo.client = client;
grabinfo.grabstate = SERVER_GRABBED;
CallCallbacks(&ServerGrabCallback, (pointer)&grabinfo);
CallCallbacks(&ServerGrabCallback, (void *)&grabinfo);
}
return(client->noClientException);
......@@ -1602,7 +1602,7 @@ UngrabServer(ClientPtr client)
ServerGrabInfoRec grabinfo;
grabinfo.client = client;
grabinfo.grabstate = SERVER_UNGRABBED;
CallCallbacks(&ServerGrabCallback, (pointer)&grabinfo);
CallCallbacks(&ServerGrabCallback, (void *)&grabinfo);
}
}
......@@ -1966,7 +1966,7 @@ ProcListFontsWithInfo(register ClientPtr client)
* \param value must conform to DeleteType
*/
int
dixDestroyPixmap(pointer value, XID pid)
dixDestroyPixmap(void * value, XID pid)
{
PixmapPtr pPixmap = (PixmapPtr)value;
return (*pPixmap->drawable.pScreen->DestroyPixmap)(pPixmap);
......@@ -2025,7 +2025,7 @@ CreatePmap:
{
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);
}
return (BadAlloc);
......@@ -2108,7 +2108,7 @@ ProcCreateGC(register ClientPtr client)
(XID *) &stuff[1], &error);
if (error != Success)
return error;
if (!AddResource(stuff->gc, RT_GC, (pointer)pGC))
if (!AddResource(stuff->gc, RT_GC, (void *)pGC))
return (BadAlloc);
return(client->noClientException);
}
......@@ -2798,7 +2798,7 @@ DoGetImage(register ClientPtr client, int format, Drawable drawable,
nlines,
format,
planemask,
(pointer) pBuf);
(void *) pBuf);
#ifdef XCSECURITY
if (pVisibleRegion)
SecurityCensorImage(client, pVisibleRegion, widthBytesLine,
......@@ -2839,7 +2839,7 @@ DoGetImage(register ClientPtr client, int format, Drawable drawable,
nlines,
format,
plane,
(pointer)pBuf);
(void *)pBuf);
#ifdef XCSECURITY
if (pVisibleRegion)
SecurityCensorImage(client, pVisibleRegion,
......@@ -3669,7 +3669,7 @@ ProcCreateCursor (register ClientPtr client)
/* zeroing the (pad) bits helps some ddx cursor handling */
bzero((char *)srcbits, n);
(* src->drawable.pScreen->GetImage)( (DrawablePtr)src, 0, 0, width, height,
XYPixmap, 1, (pointer)srcbits);
XYPixmap, 1, (void *)srcbits);
if ( msk == (PixmapPtr)NULL)
{
register unsigned char *bits = mskbits;
......@@ -3681,7 +3681,7 @@ ProcCreateCursor (register ClientPtr client)
/* zeroing the (pad) bits helps some ddx cursor handling */
bzero((char *)mskbits, n);
(* msk->drawable.pScreen->GetImage)( (DrawablePtr)msk, 0, 0, width,
height, XYPixmap, 1, (pointer)mskbits);
height, XYPixmap, 1, (void *)mskbits);
}
cm.width = width;
cm.height = height;
......@@ -3691,7 +3691,7 @@ ProcCreateCursor (register ClientPtr client)
stuff->foreRed, stuff->foreGreen, stuff->foreBlue,
stuff->backRed, stuff->backGreen, stuff->backBlue);
if (pCursor && AddResource(stuff->cid, RT_CURSOR, (pointer)pCursor))
if (pCursor && AddResource(stuff->cid, RT_CURSOR, (void *)pCursor))
{
#ifdef TEST
fprintf(stderr, "ProcCreateCursor: Created cursor at [%p].\n", (void *) pCursor);
......@@ -3721,7 +3721,7 @@ ProcCreateGlyphCursor (register ClientPtr client)
&pCursor, client);
if (res != Success)
return res;
if (AddResource(stuff->cid, RT_CURSOR, (pointer)pCursor))
if (AddResource(stuff->cid, RT_CURSOR, (void *)pCursor))
return client->noClientException;
return BadAlloc;
}
......@@ -3908,10 +3908,10 @@ ProcChangeHosts(register ClientPtr client)
if(stuff->mode == HostInsert)
result = AddHost(client, (int)stuff->hostFamily,
stuff->hostLength, (pointer)&stuff[1]);
stuff->hostLength, (void *)&stuff[1]);
else if (stuff->mode == HostDelete)
result = RemoveHost(client, (int)stuff->hostFamily,
stuff->hostLength, (pointer)&stuff[1]);
stuff->hostLength, (void *)&stuff[1]);
else
{
client->errorValue = stuff->mode;
......@@ -3927,7 +3927,7 @@ ProcListHosts(register ClientPtr client)
{
xListHostsReply reply;
int len, nHosts, result;
pointer pdata;
void * pdata;
/* REQUEST(xListHostsReq); */
REQUEST_SIZE_MATCH(xListHostsReq);
......@@ -4222,7 +4222,7 @@ CloseDownClient(register ClientPtr client)
clientinfo.client = client;
clientinfo.prefix = (xConnSetupPrefix *)NULL;
clientinfo.setup = (xConnSetup *) NULL;
CallCallbacks((&ClientStateCallback), (pointer)&clientinfo);
CallCallbacks((&ClientStateCallback), (void *)&clientinfo);
}
}
client->clientGone = TRUE; /* so events aren't sent to client */
......@@ -4259,7 +4259,7 @@ CloseDownClient(register ClientPtr client)
clientinfo.client = client;
clientinfo.prefix = (xConnSetupPrefix *)NULL;
clientinfo.setup = (xConnSetup *) NULL;
CallCallbacks((&ClientStateCallback), (pointer)&clientinfo);
CallCallbacks((&ClientStateCallback), (void *)&clientinfo);
}
FreeClientResources(client);
if (client->index < nextFreeClientID)
......@@ -4309,7 +4309,7 @@ CloseDownRetainedResources()
}
}
void InitClient(ClientPtr client, int i, pointer ospriv)
void InitClient(ClientPtr client, int i, void * ospriv)
{
client->index = i;
client->sequence = 0;
......@@ -4399,11 +4399,11 @@ InitClientPrivates(ClientPtr client)
{
if ( (size = *sizes) )
{
ppriv->ptr = (pointer)ptr;
ppriv->ptr = (void *)ptr;
ptr += size;
}
else
ppriv->ptr = (pointer)NULL;
ppriv->ptr = (void *)NULL;
}
/*
......@@ -4422,7 +4422,7 @@ InitClientPrivates(ClientPtr client)
* Returns NULL if there are no free clients.
*************************/
ClientPtr NextAvailableClient(pointer ospriv)
ClientPtr NextAvailableClient(void * ospriv)
{
register int i;
register ClientPtr client;
......@@ -4460,7 +4460,7 @@ ClientPtr NextAvailableClient(pointer ospriv)
clientinfo.client = client;
clientinfo.prefix = (xConnSetupPrefix *)NULL;
clientinfo.setup = (xConnSetup *) NULL;
CallCallbacks((&ClientStateCallback), (pointer)&clientinfo);
CallCallbacks((&ClientStateCallback), (void *)&clientinfo);
}
return(client);
}
......@@ -4595,7 +4595,7 @@ SendConnSetup(register ClientPtr client, char *reason)
clientinfo.client = client;
clientinfo.prefix = lconnSetupPrefix;
clientinfo.setup = (xConnSetup *)lConnectionInfo;
CallCallbacks((&ClientStateCallback), (pointer)&clientinfo);
CallCallbacks((&ClientStateCallback), (void *)&clientinfo);
}
return (client->noClientException);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment