diff --git a/saa/saa.c b/saa/saa.c index b0d40e1..640a600 100644 --- a/saa/saa.c +++ b/saa/saa.c @@ -478,7 +478,7 @@ saa_copy_gc(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst) } static void -saa_change_clip(GCPtr pGC, int type, pointer pvalue, int nrects) +saa_change_clip(GCPtr pGC, int type, void *pvalue, int nrects) { struct saa_gc_priv *sgc = saa_gc(pGC); diff --git a/saa/saa_pixmap.c b/saa/saa_pixmap.c index 188e7d7..889ff91 100644 --- a/saa/saa_pixmap.c +++ b/saa/saa_pixmap.c @@ -149,7 +149,7 @@ saa_destroy_pixmap(PixmapPtr pPixmap) Bool saa_modify_pixmap_header(PixmapPtr pPixmap, int width, int height, int depth, - int bitsPerPixel, int devKind, pointer pPixData) + int bitsPerPixel, int devKind, void *pPixData) { ScreenPtr pScreen; struct saa_screen_priv *sscreen; diff --git a/saa/saa_priv.h b/saa/saa_priv.h index a512980..25f1e18 100644 --- a/saa/saa_priv.h +++ b/saa/saa_priv.h @@ -220,7 +220,7 @@ saa_check_composite(CARD8 op, extern Bool saa_modify_pixmap_header(PixmapPtr pPixmap, int width, int height, int depth, - int bitsPerPixel, int devKind, pointer pPixData); + int bitsPerPixel, int devKind, void *pPixData); extern PixmapPtr saa_create_pixmap(ScreenPtr pScreen, int w, int h, int depth, diff --git a/saa/saa_unaccel.c b/saa/saa_unaccel.c index 8e0fda8..54a89da 100644 --- a/saa/saa_unaccel.c +++ b/saa/saa_unaccel.c @@ -512,7 +512,7 @@ saa_check_poly_fill_rect(DrawablePtr pDrawable, GCPtr pGC, static void saa_check_image_glyph_blt(DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, - CharInfoPtr * ppci, pointer pglyphBase) + CharInfoPtr * ppci, void *pglyphBase) { struct saa_gc_priv *sgc = saa_gc(pGC); saa_access_t access; @@ -538,7 +538,7 @@ saa_check_image_glyph_blt(DrawablePtr pDrawable, GCPtr pGC, static void saa_check_poly_glyph_blt(DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int nglyph, - CharInfoPtr * ppci, pointer pglyphBase) + CharInfoPtr * ppci, void *pglyphBase) { struct saa_gc_priv *sgc = saa_gc(pGC); saa_access_t access; diff --git a/src/vmware.c b/src/vmware.c index d4d731d..92eecdd 100644 --- a/src/vmware.c +++ b/src/vmware.c @@ -844,7 +844,7 @@ VMWAREModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool rebuildPixmap) pScrn->bitsPerPixel, PixmapBytePad(pScrn->displayWidth, pScrn->pScreen->rootDepth), - (pointer)(pVMWARE->FbBase + pScrn->fbOffset)); + (pVMWARE->FbBase + pScrn->fbOffset)); (*pScrn->EnableDisableFBAccess)(pScrn, FALSE); (*pScrn->EnableDisableFBAccess)(pScrn, TRUE); diff --git a/src/vmware_bootstrap.c b/src/vmware_bootstrap.c index 4c67243..951b0b6 100644 --- a/src/vmware_bootstrap.c +++ b/src/vmware_bootstrap.c @@ -304,7 +304,7 @@ VMWAREAvailableOptions(int chipid, int busid) static Bool VMWareDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, - pointer data) + void *data) { uint32_t *flag; xorgRRModeMM *modemm; @@ -375,8 +375,8 @@ _X_EXPORT XF86ModuleData vmwareModuleData = { NULL }; -static pointer -vmwareSetup(pointer module, pointer opts, int *errmaj, int *errmin) +static void* +vmwareSetup(void *module, void *opts, int *errmaj, int *errmin) { static Bool setupDone = FALSE; @@ -387,7 +387,7 @@ vmwareSetup(pointer module, pointer opts, int *errmaj, int *errmin) VMWARERefSymLists(); - return (pointer)1; + return (void*)1; } if (errmaj) { *errmaj = LDR_ONCEONLY; diff --git a/src/vmwarevideo.c b/src/vmwarevideo.c index d5f5688..f0b0132 100644 --- a/src/vmwarevideo.c +++ b/src/vmwarevideo.c @@ -127,7 +127,7 @@ static XF86AttributeRec vmwareVideoAttributes[] = */ typedef struct { uint32 dataOffset; - pointer data; + void *data; } VMWAREVideoBuffer; typedef struct { @@ -185,21 +185,21 @@ static int vmwareXvPutImage(ScrnInfoPtr pScrn, short src_x, short src_y, short drw_x, short drw_y, short src_w, short src_h, short drw_w, short drw_h, int image, unsigned char *buf, short width, short height, - Bool sync, RegionPtr clipBoxes, pointer data, + Bool sync, RegionPtr clipBoxes, void *data, DrawablePtr dst); -static void vmwareStopVideo(ScrnInfoPtr pScrn, pointer data, Bool Cleanup); +static void vmwareStopVideo(ScrnInfoPtr pScrn, void *data, Bool Cleanup); static int vmwareQueryImageAttributes(ScrnInfoPtr pScrn, int format, unsigned short *width, unsigned short *height, int *pitches, int *offsets); static int vmwareSetPortAttribute(ScrnInfoPtr pScrn, Atom attribute, - INT32 value, pointer data); + INT32 value, void *data); static int vmwareGetPortAttribute(ScrnInfoPtr pScrn, Atom attribute, - INT32 *value, pointer data); + INT32 *value, void *data); static void vmwareQueryBestSize(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_h, void *data); /* * Local functions for video streams @@ -1063,7 +1063,7 @@ vmwareXvPutImage(ScrnInfoPtr pScrn, short src_x, short src_y, short drw_x, short drw_y, short src_w, short src_h, short drw_w, short drw_h, int format, unsigned char *buf, short width, short height, - Bool sync, RegionPtr clipBoxes, pointer data, + Bool sync, RegionPtr clipBoxes, void *data, DrawablePtr dst) { VMWAREPtr pVMWARE = VMWAREPTR(pScrn); @@ -1101,7 +1101,7 @@ vmwareXvPutImage(ScrnInfoPtr pScrn, short src_x, short src_y, */ static void -vmwareStopVideo(ScrnInfoPtr pScrn, pointer data, Bool Cleanup) +vmwareStopVideo(ScrnInfoPtr pScrn, void *data, Bool Cleanup) { VMWAREVideoPtr pVid = data; VMWAREPtr pVMWARE = VMWAREPTR(pScrn); @@ -1224,7 +1224,7 @@ vmwareQueryImageAttributes(ScrnInfoPtr pScrn, int format, static int vmwareSetPortAttribute(ScrnInfoPtr pScrn, Atom attribute, - INT32 value, pointer data) + INT32 value, void *data) { VMWAREVideoPtr pVid = (VMWAREVideoPtr) data; Atom xvColorKey = MAKE_ATOM("XV_COLORKEY"); @@ -1264,7 +1264,7 @@ vmwareSetPortAttribute(ScrnInfoPtr pScrn, Atom attribute, static int vmwareGetPortAttribute(ScrnInfoPtr pScrn, Atom attribute, - INT32 *value, pointer data) + INT32 *value, void *data) { VMWAREVideoPtr pVid = (VMWAREVideoPtr) data; Atom xvColorKey = MAKE_ATOM("XV_COLORKEY"); @@ -1311,7 +1311,7 @@ static void vmwareQueryBestSize(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_h, void *data) { *p_w = (drw_w + 1) & ~1; *p_h = drw_h; diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c index e89165f..ea973c6 100644 --- a/vmwgfx/vmwgfx_driver.c +++ b/vmwgfx/vmwgfx_driver.c @@ -791,7 +791,7 @@ void xorg_flush(ScreenPtr pScreen) free(pixmaps); } -static void drv_block_handler(ScreenPtr pScrn, pointer pTimeout) +static void drv_block_handler(ScreenPtr pScrn, void *pTimeout) { modesettingPtr ms = modesettingPTR(xf86ScreenToScrn(pScreen)); diff --git a/vmwgfx/vmwgfx_overlay.c b/vmwgfx/vmwgfx_overlay.c index e0f4654..276b550 100644 --- a/vmwgfx/vmwgfx_overlay.c +++ b/vmwgfx/vmwgfx_overlay.c @@ -196,21 +196,21 @@ static int vmw_xv_put_image(ScrnInfoPtr pScrn, short src_x, short src_y, short drw_x, short drw_y, short src_w, short src_h, short drw_w, short drw_h, int image, unsigned char *buf, short width, short height, - Bool sync, RegionPtr clipBoxes, pointer data, + Bool sync, RegionPtr clipBoxes, void *data, DrawablePtr dst); -static void vmw_xv_stop_video(ScrnInfoPtr pScrn, pointer data, Bool Cleanup); +static void vmw_xv_stop_video(ScrnInfoPtr pScrn, void *data, Bool Cleanup); static int vmw_xv_query_image_attributes(ScrnInfoPtr pScrn, int format, unsigned short *width, unsigned short *height, int *pitches, int *offsets); static int vmw_xv_set_port_attribute(ScrnInfoPtr pScrn, Atom attribute, - INT32 value, pointer data); + INT32 value, void *data); static int vmw_xv_get_port_attribute(ScrnInfoPtr pScrn, Atom attribute, - INT32 *value, pointer data); + INT32 *value, void *data); static void vmw_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_h, void *data); /* @@ -334,7 +334,7 @@ vmw_video_init_adaptor(ScrnInfoPtr pScrn) struct vmwgfx_overlay_port *priv = vmwgfx_overlay_port_create(ms->fd, pScrn->pScreen); - adaptor->pPortPrivates[i].ptr = (pointer) priv; + adaptor->pPortPrivates[i].ptr = priv; } adaptor->nAttributes = VMWARE_VID_NUM_ATTRIBUTES; @@ -666,7 +666,7 @@ vmw_xv_put_image(ScrnInfoPtr pScrn, short src_x, short src_y, short drw_x, short drw_y, short src_w, short src_h, short drw_w, short drw_h, int format, unsigned char *buf, short width, short height, - Bool sync, RegionPtr clipBoxes, pointer data, + Bool sync, RegionPtr clipBoxes, void *data, DrawablePtr dst) { struct vmwgfx_overlay_port *port = data; @@ -701,7 +701,7 @@ vmw_xv_put_image(ScrnInfoPtr pScrn, short src_x, short src_y, */ static void -vmw_xv_stop_video(ScrnInfoPtr pScrn, pointer data, Bool cleanup) +vmw_xv_stop_video(ScrnInfoPtr pScrn, void *data, Bool cleanup) { struct vmwgfx_overlay_port *port = data; @@ -811,7 +811,7 @@ vmw_xv_query_image_attributes(ScrnInfoPtr pScrn, int format, static int vmw_xv_set_port_attribute(ScrnInfoPtr pScrn, Atom attribute, - INT32 value, pointer data) + INT32 value, void *data) { struct vmwgfx_overlay_port *port = data; Atom xvColorKey = MAKE_ATOM("XV_COLORKEY"); @@ -851,7 +851,7 @@ vmw_xv_set_port_attribute(ScrnInfoPtr pScrn, Atom attribute, static int vmw_xv_get_port_attribute(ScrnInfoPtr pScrn, Atom attribute, - INT32 *value, pointer data) + INT32 *value, void *data) { struct vmwgfx_overlay_port *port = data; Atom xvColorKey = MAKE_ATOM("XV_COLORKEY"); @@ -898,7 +898,7 @@ static void vmw_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_h, void *data) { *p_w = (drw_w + 1) & ~1; *p_h = drw_h; diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c index 0fd8998..f6061b5 100644 --- a/vmwgfx/vmwgfx_tex_video.c +++ b/vmwgfx/vmwgfx_tex_video.c @@ -216,7 +216,7 @@ vmwgfx_video_free_comp(struct xorg_xv_port_priv *priv) } static void -stop_video(ScrnInfoPtr pScrn, pointer data, Bool shutdown) +stop_video(ScrnInfoPtr pScrn, void *data, Bool shutdown) { struct xorg_xv_port_priv *priv = (struct xorg_xv_port_priv *)data; int i, j; @@ -250,7 +250,7 @@ stop_video(ScrnInfoPtr pScrn, pointer data, Bool shutdown) static int set_port_attribute(ScrnInfoPtr pScrn, - Atom attribute, INT32 value, pointer data) + Atom attribute, INT32 value, void *data) { struct xorg_xv_port_priv *priv = (struct xorg_xv_port_priv *)data; @@ -295,7 +295,7 @@ set_port_attribute(ScrnInfoPtr pScrn, static int get_port_attribute(ScrnInfoPtr pScrn, - Atom attribute, INT32 * value, pointer data) + Atom attribute, INT32 * value, void *data) { struct xorg_xv_port_priv *priv = (struct xorg_xv_port_priv *)data; @@ -318,7 +318,7 @@ 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) { if (vid_w > (drw_w << 1)) drw_w = vid_w >> 1; @@ -828,7 +828,7 @@ put_image(ScrnInfoPtr pScrn, short drw_w, short drw_h, int id, unsigned char *buf, short width, short height, - Bool sync, RegionPtr clipBoxes, pointer data, + Bool sync, RegionPtr clipBoxes, void *data, DrawablePtr pDraw) { struct xorg_xv_port_priv *pPriv = (struct xorg_xv_port_priv *) data; @@ -981,7 +981,7 @@ xorg_setup_textured_adapter(ScreenPtr pScreen) struct xorg_xv_port_priv *priv = port_priv_create(ms->xat, xar, ms->fd); - adapt->pPortPrivates[i].ptr = (pointer) (priv); + adapt->pPortPrivates[i].ptr = priv; adapt->nPorts++; }