From 68dd0b52e13c844d662192654fb10cb993257a59 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 22 Jun 2015 09:36:08 +0200 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 Rebased against NX: Mike Gabriel --- nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_span.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nx-X11/extras') diff --git a/nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_span.c b/nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_span.c index 664f365df..6ec65faa9 100644 --- a/nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_span.c +++ b/nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_span.c @@ -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); -- cgit v1.2.3