diff options
| author | Keith Packard <keithp@keithp.com> | 2013-12-15 01:05:51 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-01-12 10:24:11 -0800 |
| commit | 60014a4a98ff924ae7f6840781f768c1cc93bbab (patch) | |
| tree | a956a03a6a7c87cac4d48fb95b66fec313d87fde /dri3 | |
| parent | 93fa64e17d7bd600ebf18ecab85f5b2d17fe30ce (diff) | |
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 <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'dri3')
| -rw-r--r-- | dri3/dri3_event.c | 6 | ||||
| -rw-r--r-- | dri3/dri3_request.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/dri3/dri3_event.c b/dri3/dri3_event.c index 02f0f6579..cb509a26d 100644 --- a/dri3/dri3_event.c +++ b/dri3/dri3_event.c @@ -29,7 +29,7 @@ RESTYPE dri3_event_type; static int -dri3_free_event(pointer data, XID id) +dri3_free_event(void *data, XID id) { dri3_event_ptr dri3_event = (dri3_event_ptr) data; dri3_window_priv_ptr window_priv = dri3_window_priv(dri3_event->window); @@ -41,7 +41,7 @@ dri3_free_event(pointer data, XID id) break; } } - free((pointer) dri3_event); + free((void *) dri3_event); return 1; } @@ -145,7 +145,7 @@ dri3_select_input(ClientPtr client, XID eid, WindowPtr window, CARD32 mask) event->next = window_priv->events; window_priv->events = event; - if (!AddResource(event->id, dri3_event_type, (pointer) event)) + if (!AddResource(event->id, dri3_event_type, (void *) event)) return BadAlloc; return Success; diff --git a/dri3/dri3_request.c b/dri3/dri3_request.c index 4e1408fb5..31dce83f6 100644 --- a/dri3/dri3_request.c +++ b/dri3/dri3_request.c @@ -168,7 +168,7 @@ proc_dri3_pixmap_from_buffer(ClientPtr client) (*drawable->pScreen->DestroyPixmap) (pixmap); return rc; } - if (AddResource(stuff->pixmap, RT_PIXMAP, (pointer) pixmap)) + if (AddResource(stuff->pixmap, RT_PIXMAP, (void *) pixmap)) return Success; return Success; @@ -189,7 +189,7 @@ proc_dri3_buffer_from_pixmap(ClientPtr client) PixmapPtr pixmap; REQUEST_SIZE_MATCH(xDRI3BufferFromPixmapReq); - rc = dixLookupResourceByType((pointer *) &pixmap, stuff->pixmap, RT_PIXMAP, + rc = dixLookupResourceByType((void **) &pixmap, stuff->pixmap, RT_PIXMAP, client, DixWriteAccess); if (rc != Success) { client->errorValue = stuff->pixmap; |