aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/fb
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/fb')
-rw-r--r--xorg-server/fb/fb.h16
-rw-r--r--xorg-server/fb/fb24_32.c4
-rw-r--r--xorg-server/fb/fb24_32.h4
-rw-r--r--xorg-server/fb/fbglyph.c4
-rw-r--r--xorg-server/fb/fboverlay.c12
-rw-r--r--xorg-server/fb/fboverlay.h10
-rw-r--r--xorg-server/fb/fbpixmap.c2
-rw-r--r--xorg-server/fb/fbscreen.c10
8 files changed, 31 insertions, 31 deletions
diff --git a/xorg-server/fb/fb.h b/xorg-server/fb/fb.h
index 26957df4c..90577677b 100644
--- a/xorg-server/fb/fb.h
+++ b/xorg-server/fb/fb.h
@@ -776,7 +776,7 @@ fb24_32ModifyPixmapHeader(PixmapPtr pPixmap,
int width,
int height,
int depth,
- int bitsPerPixel, int devKind, pointer pPixData);
+ int bitsPerPixel, int devKind, void *pPixData);
/*
* fballpriv.c
@@ -1229,7 +1229,7 @@ fbPolyGlyphBlt(DrawablePtr pDrawable,
GCPtr pGC,
int x,
int y,
- unsigned int nglyph, CharInfoPtr * ppci, pointer pglyphBase);
+ unsigned int nglyph, CharInfoPtr * ppci, void *pglyphBase);
extern _X_EXPORT void
@@ -1237,7 +1237,7 @@ fbImageGlyphBlt(DrawablePtr pDrawable,
GCPtr pGC,
int x,
int y,
- unsigned int nglyph, CharInfoPtr * ppci, pointer pglyphBase);
+ unsigned int nglyph, CharInfoPtr * ppci, void *pglyphBase);
/*
* fbimage.c
@@ -1409,7 +1409,7 @@ extern _X_EXPORT void
_fbSetWindowPixmap(WindowPtr pWindow, PixmapPtr pPixmap);
extern _X_EXPORT Bool
- fbSetupScreen(ScreenPtr pScreen, pointer pbits, /* pointer to screen bitmap */
+ fbSetupScreen(ScreenPtr pScreen, void *pbits, /* pointer to screen bitmap */
int xsize, /* in pixels */
int ysize, int dpix, /* dots per inch */
int dpiy, int width, /* pixel width of frame buffer */
@@ -1418,7 +1418,7 @@ extern _X_EXPORT Bool
extern _X_EXPORT Bool
wfbFinishScreenInit(ScreenPtr pScreen,
- pointer pbits,
+ void *pbits,
int xsize,
int ysize,
int dpix,
@@ -1430,7 +1430,7 @@ wfbFinishScreenInit(ScreenPtr pScreen,
extern _X_EXPORT Bool
wfbScreenInit(ScreenPtr pScreen,
- pointer pbits,
+ void *pbits,
int xsize,
int ysize,
int dpix,
@@ -1442,14 +1442,14 @@ wfbScreenInit(ScreenPtr pScreen,
extern _X_EXPORT Bool
fbFinishScreenInit(ScreenPtr pScreen,
- pointer pbits,
+ void *pbits,
int xsize,
int ysize, int dpix, int dpiy, int width, int bpp);
extern _X_EXPORT Bool
fbScreenInit(ScreenPtr pScreen,
- pointer pbits,
+ void *pbits,
int xsize, int ysize, int dpix, int dpiy, int width, int bpp);
/*
diff --git a/xorg-server/fb/fb24_32.c b/xorg-server/fb/fb24_32.c
index 5eb81e8f0..ecb39510d 100644
--- a/xorg-server/fb/fb24_32.c
+++ b/xorg-server/fb/fb24_32.c
@@ -495,7 +495,7 @@ fb24_32ReformatTile(PixmapPtr pOldTile, int bitsPerPixel)
}
typedef struct {
- pointer pbits;
+ void *pbits;
int width;
} miScreenInitParmsRec, *miScreenInitParmsPtr;
@@ -526,7 +526,7 @@ fb24_32ModifyPixmapHeader(PixmapPtr pPixmap,
int width,
int height,
int depth,
- int bitsPerPixel, int devKind, pointer pPixData)
+ int bitsPerPixel, int devKind, void *pPixData)
{
int bpp, w;
diff --git a/xorg-server/fb/fb24_32.h b/xorg-server/fb/fb24_32.h
index 1bec00b80..b357edf38 100644
--- a/xorg-server/fb/fb24_32.h
+++ b/xorg-server/fb/fb24_32.h
@@ -31,14 +31,14 @@
Bool
fb24_32FinishScreenInit(ScreenPtr pScreen,
- pointer pbits,
+ void *pbits,
int xsize,
int ysize, int dpix, int dpiy, int width, int bpp);
Bool
fb24_32ScreenInit(ScreenPtr pScreen,
- pointer pbits,
+ void *pbits,
int xsize, int ysize, int dpix, int dpiy, int width, int bpp);
#endif
diff --git a/xorg-server/fb/fbglyph.c b/xorg-server/fb/fbglyph.c
index 3080a7728..4f2904c31 100644
--- a/xorg-server/fb/fbglyph.c
+++ b/xorg-server/fb/fbglyph.c
@@ -241,7 +241,7 @@ fbPolyGlyphBlt(DrawablePtr pDrawable,
GCPtr pGC,
int x,
int y,
- unsigned int nglyph, CharInfoPtr * ppci, pointer pglyphBase)
+ unsigned int nglyph, CharInfoPtr * ppci, void *pglyphBase)
{
FbGCPrivPtr pPriv = fbGetGCPrivate(pGC);
CharInfoPtr pci;
@@ -309,7 +309,7 @@ fbImageGlyphBlt(DrawablePtr pDrawable,
GCPtr pGC,
int x,
int y,
- unsigned int nglyph, CharInfoPtr * ppciInit, pointer pglyphBase)
+ unsigned int nglyph, CharInfoPtr * ppciInit, void *pglyphBase)
{
FbGCPrivPtr pPriv = fbGetGCPrivate(pGC);
CharInfoPtr *ppci;
diff --git a/xorg-server/fb/fboverlay.c b/xorg-server/fb/fboverlay.c
index c6802e4b4..935bf1b50 100644
--- a/xorg-server/fb/fboverlay.c
+++ b/xorg-server/fb/fboverlay.c
@@ -104,7 +104,7 @@ fbOverlayWindowLayer(WindowPtr pWin)
for (i = 0; i < pScrPriv->nlayers; i++)
if (dixLookupPrivate(&pWin->devPrivates, fbGetWinPrivateKey(pWin)) ==
- (pointer) pScrPriv->layer[i].u.run.pixmap)
+ (void *) pScrPriv->layer[i].u.run.pixmap)
return i;
return 0;
}
@@ -115,7 +115,7 @@ fbOverlayCreateScreenResources(ScreenPtr pScreen)
int i;
FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pScreen);
PixmapPtr pPixmap;
- pointer pbits;
+ void *pbits;
int width;
int depth;
BoxRec box;
@@ -250,8 +250,8 @@ fbOverlayWindowExposures(WindowPtr pWin,
Bool
fbOverlaySetupScreen(ScreenPtr pScreen,
- pointer pbits1,
- pointer pbits2,
+ void *pbits1,
+ void *pbits2,
int xsize,
int ysize,
int dpix,
@@ -287,8 +287,8 @@ fb24_32OverlayCreateScreenResources(ScreenPtr pScreen)
Bool
fbOverlayFinishScreenInit(ScreenPtr pScreen,
- pointer pbits1,
- pointer pbits2,
+ void *pbits1,
+ void *pbits2,
int xsize,
int ysize,
int dpix,
diff --git a/xorg-server/fb/fboverlay.h b/xorg-server/fb/fboverlay.h
index 9a93457c7..57c9873c2 100644
--- a/xorg-server/fb/fboverlay.h
+++ b/xorg-server/fb/fboverlay.h
@@ -38,7 +38,7 @@ typedef void (*fbOverlayPaintKeyProc) (DrawablePtr, RegionPtr, CARD32, int);
typedef struct _fbOverlayLayer {
union {
struct {
- pointer pbits;
+ void *pbits;
int width;
int depth;
} init;
@@ -89,8 +89,8 @@ fbOverlayWindowExposures(WindowPtr pWin,
extern _X_EXPORT Bool
fbOverlaySetupScreen(ScreenPtr pScreen,
- pointer pbits1,
- pointer pbits2,
+ void *pbits1,
+ void *pbits2,
int xsize,
int ysize,
int dpix,
@@ -99,8 +99,8 @@ fbOverlaySetupScreen(ScreenPtr pScreen,
extern _X_EXPORT Bool
fbOverlayFinishScreenInit(ScreenPtr pScreen,
- pointer pbits1,
- pointer pbits2,
+ void *pbits1,
+ void *pbits2,
int xsize,
int ysize,
int dpix,
diff --git a/xorg-server/fb/fbpixmap.c b/xorg-server/fb/fbpixmap.c
index 0824b64bb..677f28af0 100644
--- a/xorg-server/fb/fbpixmap.c
+++ b/xorg-server/fb/fbpixmap.c
@@ -66,7 +66,7 @@ fbCreatePixmapBpp(ScreenPtr pScreen, int width, int height, int depth, int bpp,
pPixmap->drawable.height = height;
pPixmap->devKind = paddedWidth;
pPixmap->refcnt = 1;
- pPixmap->devPrivate.ptr = (pointer) ((char *) pPixmap + base + adjust);
+ pPixmap->devPrivate.ptr = (void *) ((char *) pPixmap + base + adjust);
pPixmap->master_pixmap = NULL;
#ifdef FB_DEBUG
diff --git a/xorg-server/fb/fbscreen.c b/xorg-server/fb/fbscreen.c
index f9080a445..b2b973974 100644
--- a/xorg-server/fb/fbscreen.c
+++ b/xorg-server/fb/fbscreen.c
@@ -90,7 +90,7 @@ _fbSetWindowPixmap(WindowPtr pWindow, PixmapPtr pPixmap)
}
Bool
-fbSetupScreen(ScreenPtr pScreen, pointer pbits, /* pointer to screen bitmap */
+fbSetupScreen(ScreenPtr pScreen, void *pbits, /* pointer to screen bitmap */
int xsize, /* in pixels */
int ysize, int dpix, /* dots per inch */
int dpiy, int width, /* pixel width of frame buffer */
@@ -135,7 +135,7 @@ fbSetupScreen(ScreenPtr pScreen, pointer pbits, /* pointer to screen bitmap */
#ifdef FB_ACCESS_WRAPPER
Bool
wfbFinishScreenInit(ScreenPtr pScreen,
- pointer pbits,
+ void *pbits,
int xsize,
int ysize,
int dpix,
@@ -146,7 +146,7 @@ wfbFinishScreenInit(ScreenPtr pScreen,
#else
Bool
fbFinishScreenInit(ScreenPtr pScreen,
- pointer pbits,
+ void *pbits,
int xsize, int ysize, int dpix, int dpiy, int width, int bpp)
#endif
{
@@ -224,7 +224,7 @@ fbFinishScreenInit(ScreenPtr pScreen,
#ifdef FB_ACCESS_WRAPPER
Bool
wfbScreenInit(ScreenPtr pScreen,
- pointer pbits,
+ void *pbits,
int xsize,
int ysize,
int dpix,
@@ -242,7 +242,7 @@ wfbScreenInit(ScreenPtr pScreen,
#else
Bool
fbScreenInit(ScreenPtr pScreen,
- pointer pbits,
+ void *pbits,
int xsize, int ysize, int dpix, int dpiy, int width, int bpp)
{
if (!fbSetupScreen(pScreen, pbits, xsize, ysize, dpix, dpiy, width, bpp))
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 21:40:50 +0000