From 54e78ec31e030d488765341a0c143c5a060c3768 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 22 Jan 2014 15:03:26 -0800 Subject: [PATCH] glamor: Convert use of the old "pointer" typedef to "void *". Reviewed-by: Keith Packard --- glamor/glamor.h | 4 ++-- glamor/glamor_glyphblt.c | 12 ++++++------ glamor/glamor_priv.h | 4 ++-- glamor/glamor_xv.c | 12 ++++++------ 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/glamor/glamor.h b/glamor/glamor.h index f1805e01d..05f565b12 100644 --- a/glamor/glamor.h +++ b/glamor/glamor.h @@ -411,13 +411,13 @@ extern _X_EXPORT Bool glamor_image_glyph_blt_nf(DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, CharInfoPtr *ppci, - pointer pglyphBase); + void *pglyphBase); extern _X_EXPORT Bool glamor_poly_glyph_blt_nf(DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, CharInfoPtr *ppci, - pointer pglyphBase); + void *pglyphBase); extern _X_EXPORT Bool glamor_push_pixels_nf(GCPtr pGC, PixmapPtr pBitmap, DrawablePtr pDrawable, int w, int h, diff --git a/glamor/glamor_glyphblt.c b/glamor/glamor_glyphblt.c index 9908c0655..6f754ce2b 100644 --- a/glamor/glamor_glyphblt.c +++ b/glamor/glamor_glyphblt.c @@ -31,7 +31,7 @@ static Bool _glamor_image_glyph_blt(DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, - CharInfoPtr *ppci, pointer pglyphBase, Bool fallback) + CharInfoPtr *ppci, void *pglyphBase, Bool fallback) { if (!fallback && glamor_ddx_fallback_check_pixmap(pDrawable) && glamor_ddx_fallback_check_gc(pGC)) @@ -44,7 +44,7 @@ _glamor_image_glyph_blt(DrawablePtr pDrawable, GCPtr pGC, void glamor_image_glyph_blt(DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, - CharInfoPtr *ppci, pointer pglyphBase) + CharInfoPtr *ppci, void *pglyphBase) { _glamor_image_glyph_blt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase, TRUE); @@ -53,7 +53,7 @@ glamor_image_glyph_blt(DrawablePtr pDrawable, GCPtr pGC, Bool glamor_image_glyph_blt_nf(DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, - CharInfoPtr *ppci, pointer pglyphBase) + CharInfoPtr *ppci, void *pglyphBase) { return _glamor_image_glyph_blt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase, FALSE); @@ -62,7 +62,7 @@ glamor_image_glyph_blt_nf(DrawablePtr pDrawable, GCPtr pGC, static Bool _glamor_poly_glyph_blt(DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, - CharInfoPtr *ppci, pointer pglyphBase, Bool fallback) + CharInfoPtr *ppci, void *pglyphBase, Bool fallback) { if (!fallback && glamor_ddx_fallback_check_pixmap(pDrawable) && glamor_ddx_fallback_check_gc(pGC)) @@ -75,7 +75,7 @@ _glamor_poly_glyph_blt(DrawablePtr pDrawable, GCPtr pGC, void glamor_poly_glyph_blt(DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, - CharInfoPtr *ppci, pointer pglyphBase) + CharInfoPtr *ppci, void *pglyphBase) { _glamor_poly_glyph_blt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase, TRUE); @@ -84,7 +84,7 @@ glamor_poly_glyph_blt(DrawablePtr pDrawable, GCPtr pGC, Bool glamor_poly_glyph_blt_nf(DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, - CharInfoPtr *ppci, pointer pglyphBase) + CharInfoPtr *ppci, void *pglyphBase) { return _glamor_poly_glyph_blt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase, FALSE); diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h index 8ccf4faef..b04fa465b 100644 --- a/glamor/glamor_priv.h +++ b/glamor/glamor_priv.h @@ -925,11 +925,11 @@ RegionPtr glamor_copy_plane(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, void glamor_image_glyph_blt(DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, - CharInfoPtr *ppci, pointer pglyphBase); + CharInfoPtr *ppci, void *pglyphBase); void glamor_poly_glyph_blt(DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, - CharInfoPtr *ppci, pointer pglyphBase); + CharInfoPtr *ppci, void *pglyphBase); void glamor_push_pixels(GCPtr pGC, PixmapPtr pBitmap, DrawablePtr pDrawable, int w, int h, int x, int y); diff --git a/glamor/glamor_xv.c b/glamor/glamor_xv.c index 6e91a0c00..cbe07c8b1 100644 --- a/glamor/glamor_xv.c +++ b/glamor/glamor_xv.c @@ -154,7 +154,7 @@ static XF86ImageRec Images[NUM_IMAGES] = { }; static void -glamor_xv_stop_video(ScrnInfoPtr pScrn, pointer data, Bool cleanup) +glamor_xv_stop_video(ScrnInfoPtr pScrn, void *data, Bool cleanup) { glamor_port_private *port_priv = (glamor_port_private *) data; int i; @@ -172,7 +172,7 @@ glamor_xv_stop_video(ScrnInfoPtr pScrn, pointer data, Bool cleanup) static int glamor_xv_set_port_attribute(ScrnInfoPtr pScrn, - Atom attribute, INT32 value, pointer data) + Atom attribute, INT32 value, void *data) { glamor_port_private *port_priv = (glamor_port_private *) data; @@ -195,7 +195,7 @@ glamor_xv_set_port_attribute(ScrnInfoPtr pScrn, static int glamor_xv_get_port_attribute(ScrnInfoPtr pScrn, - Atom attribute, INT32 *value, pointer data) + Atom attribute, INT32 *value, void *data) { glamor_port_private *port_priv = (glamor_port_private *) data; @@ -222,7 +222,7 @@ glamor_xv_query_best_size(ScrnInfoPtr pScrn, Bool motion, short vid_w, short vid_h, short drw_w, short drw_h, - unsigned int *p_w, unsigned int *p_h, pointer data) + unsigned int *p_w, unsigned int *p_h, void *data) { *p_w = drw_w; *p_h = drw_h; @@ -440,7 +440,7 @@ glamor_xv_put_image(ScrnInfoPtr pScrn, short width, short height, Bool sync, - RegionPtr clipBoxes, pointer data, DrawablePtr pDrawable) + RegionPtr clipBoxes, void *data, DrawablePtr pDrawable) { ScreenPtr screen = xf86ScrnToScreen(pScrn); glamor_port_private *port_priv = (glamor_port_private *) data; @@ -622,7 +622,7 @@ glamor_xv_init(ScreenPtr screen, int num_texture_ports) REGION_NULL(pScreen, &pPriv->clip); - adapt->pPortPrivates[i].ptr = (pointer) (pPriv); + adapt->pPortPrivates[i].ptr = (void *) (pPriv); } return adapt; }