aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/extras/Mesa/src/mesa/drivers
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-12-28 13:03:52 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-12-28 13:03:52 +0100
commitedce25213ffc81389909c827c9aaac27b736b483 (patch)
treea97ab98a06147cd5fb194063a9984dc3973fba55 /nx-X11/extras/Mesa/src/mesa/drivers
parente9f44221b2520a1d894b3c125269b5d10438453b (diff)
parent68dd0b52e13c844d662192654fb10cb993257a59 (diff)
downloadnx-libs-edce25213ffc81389909c827c9aaac27b736b483.tar.gz
nx-libs-edce25213ffc81389909c827c9aaac27b736b483.tar.bz2
nx-libs-edce25213ffc81389909c827c9aaac27b736b483.zip
Merge branch 'sunweaver-pr/change-pointer-into-void' into 3.6.x
Attributes GH PR #54: https://github.com/ArcticaProject/nx-libs/pull/54
Diffstat (limited to 'nx-X11/extras/Mesa/src/mesa/drivers')
-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);