aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/extras/Mesa/src
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2015-06-22 09:36:08 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-12-28 12:54:40 +0100
commit68dd0b52e13c844d662192654fb10cb993257a59 (patch)
treea97ab98a06147cd5fb194063a9984dc3973fba55 /nx-X11/extras/Mesa/src
parente9f44221b2520a1d894b3c125269b5d10438453b (diff)
downloadnx-libs-68dd0b52e13c844d662192654fb10cb993257a59.tar.gz
nx-libs-68dd0b52e13c844d662192654fb10cb993257a59.tar.bz2
nx-libs-68dd0b52e13c844d662192654fb10cb993257a59.zip
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> Rebased against NX: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Diffstat (limited to 'nx-X11/extras/Mesa/src')
-rw-r--r--nx-X11/extras/Mesa/src/mesa/drivers/x11/xm_span.c6
1 files changed, 3 insertions, 3 deletions
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);