From 60014a4a98ff924ae7f6840781f768c1cc93bbab Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 15 Dec 2013 01:05:51 -0800 Subject: 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: Keith Packard Reviewed-by: Eric Anholt --- glx/glxcmds.c | 6 +++--- glx/glxext.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'glx') diff --git a/glx/glxcmds.c b/glx/glxcmds.c index b8da04882..187e42665 100644 --- a/glx/glxcmds.c +++ b/glx/glxcmds.c @@ -133,7 +133,7 @@ _X_HIDDEN int validGlxContext(ClientPtr client, XID id, int access_mode, __GLXcontext ** context, int *err) { - *err = dixLookupResourceByType((pointer *) context, id, + *err = dixLookupResourceByType((void **) context, id, __glXContextRes, client, access_mode); if (*err != Success || (*context)->idExists == GL_FALSE) { client->errorValue = id; @@ -151,7 +151,7 @@ validGlxDrawable(ClientPtr client, XID id, int type, int access_mode, { int rc; - rc = dixLookupResourceByType((pointer *) drawable, id, + rc = dixLookupResourceByType((void **) drawable, id, __glXDrawableRes, client, access_mode); if (rc != Success && rc != BadValue) { *err = rc; @@ -2507,7 +2507,7 @@ __glXpresentCompleteNotify(WindowPtr window, CARD8 present_mode, CARD32 serial, int glx_type; int rc; - rc = dixLookupResourceByType((pointer *) &drawable, window->drawable.id, + rc = dixLookupResourceByType((void **) &drawable, window->drawable.id, __glXDrawableRes, serverClient, DixGetAttrAccess); if (rc != Success) diff --git a/glx/glxext.c b/glx/glxext.c index 316b4f6e8..6a34ac299 100644 --- a/glx/glxext.c +++ b/glx/glxext.c @@ -164,7 +164,7 @@ __glXAddContext(__GLXcontext * cx) { /* Register this context as a resource. */ - if (!AddResource(cx->id, __glXContextRes, (pointer)cx)) { + if (!AddResource(cx->id, __glXContextRes, (void *)cx)) { return False; } @@ -278,7 +278,7 @@ glxGetClient(ClientPtr pClient) } static void -glxClientCallback(CallbackListPtr *list, pointer closure, pointer data) +glxClientCallback(CallbackListPtr *list, void *closure, void *data) { NewClientInfoRec *clientinfo = (NewClientInfoRec *) data; ClientPtr pClient = clientinfo->client; -- cgit v1.2.3