From 68dd0b52e13c844d662192654fb10cb993257a59 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 22 Jun 2015 09:36:08 +0200
Subject: 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>
---
nx-X11/programs/Xserver/fb/fb.h | 12 +++---
nx-X11/programs/Xserver/fb/fb24_32.c | 4 +-
nx-X11/programs/Xserver/fb/fb24_32.h | 4 +-
nx-X11/programs/Xserver/fb/fballpriv.c | 2 +-
nx-X11/programs/Xserver/fb/fbglyph.c | 4 +-
nx-X11/programs/Xserver/fb/fboverlay.c | 16 ++++----
nx-X11/programs/Xserver/fb/fboverlay.h | 10 ++---
nx-X11/programs/Xserver/fb/fbpixmap.c | 2 +-
nx-X11/programs/Xserver/fb/fbpseudocolor.c | 60 +++++++++++++++---------------
nx-X11/programs/Xserver/fb/fbscreen.c | 8 ++--
nx-X11/programs/Xserver/fb/fbwindow.c | 2 +-
11 files changed, 62 insertions(+), 62 deletions(-)
(limited to 'nx-X11/programs/Xserver/fb')
diff --git a/nx-X11/programs/Xserver/fb/fb.h b/nx-X11/programs/Xserver/fb/fb.h
index 3ee79d4af..202638d32 100644
--- a/nx-X11/programs/Xserver/fb/fb.h
+++ b/nx-X11/programs/Xserver/fb/fb.h
@@ -795,7 +795,7 @@ fb24_32ModifyPixmapHeader (PixmapPtr pPixmap,
int depth,
int bitsPerPixel,
int devKind,
- pointer pPixData);
+ void *pPixData);
/*
* fballpriv.c
@@ -1486,7 +1486,7 @@ fbPolyGlyphBlt (DrawablePtr pDrawable,
int y,
unsigned int nglyph,
CharInfoPtr *ppci,
- pointer pglyphBase);
+ void *pglyphBase);
void
fbImageGlyphBlt (DrawablePtr pDrawable,
@@ -1495,7 +1495,7 @@ fbImageGlyphBlt (DrawablePtr pDrawable,
int y,
unsigned int nglyph,
CharInfoPtr *ppci,
- pointer pglyphBase);
+ void *pglyphBase);
/*
* fbimage.c
@@ -1732,7 +1732,7 @@ _fbSetWindowPixmap (WindowPtr pWindow, PixmapPtr pPixmap);
Bool
fbSetupScreen(ScreenPtr pScreen,
- pointer pbits, /* pointer to screen bitmap */
+ void *pbits, /* pointer to screen bitmap */
int xsize, /* in pixels */
int ysize,
int dpix, /* dots per inch */
@@ -1742,7 +1742,7 @@ fbSetupScreen(ScreenPtr pScreen,
Bool
fbFinishScreenInit(ScreenPtr pScreen,
- pointer pbits,
+ void *pbits,
int xsize,
int ysize,
int dpix,
@@ -1752,7 +1752,7 @@ fbFinishScreenInit(ScreenPtr pScreen,
Bool
fbScreenInit(ScreenPtr pScreen,
- pointer pbits,
+ void *pbits,
int xsize,
int ysize,
int dpix,
diff --git a/nx-X11/programs/Xserver/fb/fb24_32.c b/nx-X11/programs/Xserver/fb/fb24_32.c
index 214e2e6dd..68e0ef84d 100644
--- a/nx-X11/programs/Xserver/fb/fb24_32.c
+++ b/nx-X11/programs/Xserver/fb/fb24_32.c
@@ -571,7 +571,7 @@ fb24_32ReformatTile(PixmapPtr pOldTile, int bitsPerPixel)
}
typedef struct {
- pointer pbits;
+ void * pbits;
int width;
} miScreenInitParmsRec, *miScreenInitParmsPtr;
@@ -603,7 +603,7 @@ fb24_32ModifyPixmapHeader (PixmapPtr pPixmap,
int depth,
int bitsPerPixel,
int devKind,
- pointer pPixData)
+ void *pPixData)
{
int bpp, w;
diff --git a/nx-X11/programs/Xserver/fb/fb24_32.h b/nx-X11/programs/Xserver/fb/fb24_32.h
index 3c83f3423..023042025 100644
--- a/nx-X11/programs/Xserver/fb/fb24_32.h
+++ b/nx-X11/programs/Xserver/fb/fb24_32.h
@@ -32,7 +32,7 @@
Bool
fb24_32FinishScreenInit(ScreenPtr pScreen,
- pointer pbits,
+ void *pbits,
int xsize,
int ysize,
int dpix,
@@ -42,7 +42,7 @@ fb24_32FinishScreenInit(ScreenPtr pScreen,
Bool
fb24_32ScreenInit(ScreenPtr pScreen,
- pointer pbits,
+ void *pbits,
int xsize,
int ysize,
int dpix,
diff --git a/nx-X11/programs/Xserver/fb/fballpriv.c b/nx-X11/programs/Xserver/fb/fballpriv.c
index 75b577049..c1cd834f1 100644
--- a/nx-X11/programs/Xserver/fb/fballpriv.c
+++ b/nx-X11/programs/Xserver/fb/fballpriv.c
@@ -86,7 +86,7 @@ fbAllocatePrivates(ScreenPtr pScreen, int *pGCIndex)
pScreenPriv = (FbScreenPrivPtr) xalloc (sizeof (FbScreenPrivRec));
if (!pScreenPriv)
return FALSE;
- pScreen->devPrivates[fbScreenPrivateIndex].ptr = (pointer) pScreenPriv;
+ pScreen->devPrivates[fbScreenPrivateIndex].ptr = (void *) pScreenPriv;
}
#endif
return TRUE;
diff --git a/nx-X11/programs/Xserver/fb/fbglyph.c b/nx-X11/programs/Xserver/fb/fbglyph.c
index 46334db50..bb0dda669 100644
--- a/nx-X11/programs/Xserver/fb/fbglyph.c
+++ b/nx-X11/programs/Xserver/fb/fbglyph.c
@@ -262,7 +262,7 @@ fbPolyGlyphBlt (DrawablePtr pDrawable,
int y,
unsigned int nglyph,
CharInfoPtr *ppci,
- pointer pglyphBase)
+ void * pglyphBase)
{
FbGCPrivPtr pPriv = fbGetGCPrivate (pGC);
CharInfoPtr pci;
@@ -350,7 +350,7 @@ fbImageGlyphBlt (DrawablePtr pDrawable,
int y,
unsigned int nglyph,
CharInfoPtr *ppciInit,
- pointer pglyphBase)
+ void * pglyphBase)
{
FbGCPrivPtr pPriv = fbGetGCPrivate(pGC);
CharInfoPtr *ppci;
diff --git a/nx-X11/programs/Xserver/fb/fboverlay.c b/nx-X11/programs/Xserver/fb/fboverlay.c
index 87524e27e..81c54316f 100644
--- a/nx-X11/programs/Xserver/fb/fboverlay.c
+++ b/nx-X11/programs/Xserver/fb/fboverlay.c
@@ -64,7 +64,7 @@ fbOverlayCreateWindow(WindowPtr pWin)
pPixmap = pScrPriv->layer[i].u.run.pixmap;
if (pWin->drawable.depth == pPixmap->drawable.depth)
{
- pWin->devPrivates[fbWinPrivateIndex].ptr = (pointer) pPixmap;
+ pWin->devPrivates[fbWinPrivateIndex].ptr = (void *) pPixmap;
/*
* Make sure layer keys are written correctly by
* having non-root layers set to full while the
@@ -108,7 +108,7 @@ fbOverlayWindowLayer(WindowPtr pWin)
for (i = 0; i < pScrPriv->nlayers; i++)
if (pWin->devPrivates[fbWinPrivateIndex].ptr ==
- (pointer) pScrPriv->layer[i].u.run.pixmap)
+ (void *) pScrPriv->layer[i].u.run.pixmap)
return i;
return 0;
}
@@ -119,7 +119,7 @@ fbOverlayCreateScreenResources(ScreenPtr pScreen)
int i;
FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pScreen);
PixmapPtr pPixmap;
- pointer pbits;
+ void * pbits;
int width;
int depth;
BoxRec box;
@@ -289,8 +289,8 @@ fbOverlayPaintWindow(WindowPtr pWin, RegionPtr pRegion, int what)
Bool
fbOverlaySetupScreen(ScreenPtr pScreen,
- pointer pbits1,
- pointer pbits2,
+ void * pbits1,
+ void * pbits2,
int xsize,
int ysize,
int dpix,
@@ -336,8 +336,8 @@ fb24_32OverlayCreateScreenResources(ScreenPtr pScreen)
Bool
fbOverlayFinishScreenInit(ScreenPtr pScreen,
- pointer pbits1,
- pointer pbits2,
+ void * pbits1,
+ void * pbits2,
int xsize,
int ysize,
int dpix,
@@ -436,7 +436,7 @@ fbOverlayFinishScreenInit(ScreenPtr pScreen,
pScrPriv->layer[1].u.init.width = width2;
pScrPriv->layer[1].u.init.depth = depth2;
- pScreen->devPrivates[fbOverlayScreenPrivateIndex].ptr = (pointer) pScrPriv;
+ pScreen->devPrivates[fbOverlayScreenPrivateIndex].ptr = (void *) pScrPriv;
/* overwrite miCloseScreen with our own */
pScreen->CloseScreen = fbOverlayCloseScreen;
diff --git a/nx-X11/programs/Xserver/fb/fboverlay.h b/nx-X11/programs/Xserver/fb/fboverlay.h
index e6a4e033f..d1469f22a 100644
--- a/nx-X11/programs/Xserver/fb/fboverlay.h
+++ b/nx-X11/programs/Xserver/fb/fboverlay.h
@@ -39,7 +39,7 @@ typedef void (*fbOverlayPaintKeyProc) (DrawablePtr, RegionPtr, CARD32, int);
typedef struct _fbOverlayLayer {
union {
struct {
- pointer pbits;
+ void * pbits;
int width;
int depth;
} init;
@@ -100,8 +100,8 @@ fbOverlayPaintWindow(WindowPtr pWin, RegionPtr pRegion, int what);
Bool
fbOverlaySetupScreen(ScreenPtr pScreen,
- pointer pbits1,
- pointer pbits2,
+ void * pbits1,
+ void * pbits2,
int xsize,
int ysize,
int dpix,
@@ -113,8 +113,8 @@ fbOverlaySetupScreen(ScreenPtr pScreen,
Bool
fbOverlayFinishScreenInit(ScreenPtr pScreen,
- pointer pbits1,
- pointer pbits2,
+ void * pbits1,
+ void * pbits2,
int xsize,
int ysize,
int dpix,
diff --git a/nx-X11/programs/Xserver/fb/fbpixmap.c b/nx-X11/programs/Xserver/fb/fbpixmap.c
index decc07ba6..7ea288cb1 100644
--- a/nx-X11/programs/Xserver/fb/fbpixmap.c
+++ b/nx-X11/programs/Xserver/fb/fbpixmap.c
@@ -73,7 +73,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);
#ifdef FB_DEBUG
pPixmap->devPrivate.ptr = (void *) ((char *) pPixmap->devPrivate.ptr + paddedWidth);
fbInitializeDrawable (&pPixmap->drawable);
diff --git a/nx-X11/programs/Xserver/fb/fbpseudocolor.c b/nx-X11/programs/Xserver/fb/fbpseudocolor.c
index ef40b7073..83d556a0e 100644
--- a/nx-X11/programs/Xserver/fb/fbpseudocolor.c
+++ b/nx-X11/programs/Xserver/fb/fbpseudocolor.c
@@ -20,7 +20,7 @@ static void xxValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDraw);
static void xxDestroyGC(GCPtr pGC);
static void xxChangeGC (GCPtr pGC, unsigned long mask);
static void xxCopyGC (GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst);
-static void xxChangeClip (GCPtr pGC, int type, pointer pvalue, int nrects);
+static void xxChangeClip (GCPtr pGC, int type, void * pvalue, int nrects);
static void xxCopyClip(GCPtr pgcDst, GCPtr pgcSrc);
static void xxDestroyClip(GCPtr pGC);
@@ -63,10 +63,10 @@ static void xxImageText16(DrawablePtr pDraw, GCPtr pGC, int x, int y,
int count, unsigned short *chars);
static void xxImageGlyphBlt(DrawablePtr pDraw, GCPtr pGC, int x, int y,
unsigned int nglyph, CharInfoPtr *ppci,
- pointer pglyphBase);
+ void * pglyphBase);
static void xxPolyGlyphBlt(DrawablePtr pDraw, GCPtr pGC, int x, int y,
unsigned int nglyph, CharInfoPtr *ppci,
- pointer pglyphBase);
+ void * pglyphBase);
static void xxPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDraw,
int dx, int dy, int xOrg, int yOrg);
static void
@@ -108,7 +108,7 @@ typedef struct {
#endif
PixmapPtr pPixmap;
char * addr;
- pointer pBits;
+ void *pBits;
RegionRec region;
VisualPtr bVisual;
RegionRec bRegion;
@@ -200,7 +200,7 @@ xxUpdateWindowImmediately(WindowPtr pWin)
pmap = (ColormapPtr)LookupIDByType(wColormap(pWin),RT_COLORMAP);
- if (pmap && (pCmapPriv = xxGetCmapPriv(pmap)) != (pointer)-1) {
+ if (pmap && (pCmapPriv = xxGetCmapPriv(pmap)) != (void *)-1) {
xxCopyPseudocolorRegion(pWin->drawable.pScreen,
&pScrPriv->region, pCmapPriv);
}
@@ -259,7 +259,7 @@ xxCreateScreenResources(ScreenPtr pScreen)
PixmapPtr pPixmap;
BoxRec box;
int depth = pScrPriv->myDepth;
- pointer pBits;
+ void *pBits;
unwrap (pScrPriv,pScreen, CreateScreenResources);
ret = pScreen->CreateScreenResources(pScreen);
@@ -364,16 +364,16 @@ xxInitColormapPrivate(ColormapPtr pmap)
{
xxScrPriv(pmap->pScreen);
xxCmapPrivPtr pCmapPriv;
- pointer cmap;
+ void *cmap;
- pmap->devPrivates[xxColormapPrivateIndex].ptr = (pointer) -1;
+ pmap->devPrivates[xxColormapPrivateIndex].ptr = (void *) -1;
if (xxMyVisual(pmap->pScreen,pmap->pVisual->vid)) {
DBG("CreateColormap\n");
pCmapPriv = (xxCmapPrivPtr) xalloc (sizeof (xxCmapPrivRec));
if (!pCmapPriv)
return FALSE;
- pmap->devPrivates[xxColormapPrivateIndex].ptr = (pointer) pCmapPriv;
+ pmap->devPrivates[xxColormapPrivateIndex].ptr = (void *) pCmapPriv;
cmap = xalloc(sizeof (CARD32) * (1 << pScrPriv->myDepth));
if (!cmap)
return FALSE;
@@ -437,7 +437,7 @@ xxDestroyColormap(ColormapPtr pmap)
xxScrPriv(pmap->pScreen);
xxCmapPriv(pmap);
- if (pCmapPriv != (pointer) -1) {
+ if (pCmapPriv != (void *) -1) {
xxCmapPrivPtr tmpCmapPriv = pScrPriv->Cmaps;
xxCmapPrivPtr *prevCmapPriv = &pScrPriv->Cmaps;
int n;
@@ -489,7 +489,7 @@ xxStoreColors(ColormapPtr pmap, int nColors, xColorItem *pColors)
xxScrPriv(pmap->pScreen);
xxCmapPriv(pmap);
- if (pCmapPriv != (pointer) -1) {
+ if (pCmapPriv != (void *) -1) {
xColorItem *expanddefs;
int i;
@@ -547,7 +547,7 @@ xxInstallColormap(ColormapPtr pmap)
xxScrPriv(pmap->pScreen);
xxCmapPriv(pmap);
- if (pCmapPriv != (pointer) -1) {
+ if (pCmapPriv != (void *) -1) {
Pixel *pixels;
xrgb *colors;
int i;
@@ -619,7 +619,7 @@ xxUninstallColormap(ColormapPtr pmap)
xxScrPriv(pmap->pScreen);
xxCmapPriv(pmap);
- if (pCmapPriv != (pointer) -1) {
+ if (pCmapPriv != (void *) -1) {
int num;
if ((num = xxCmapInstalled(pmap)) == -1)
@@ -675,7 +675,7 @@ xxCreateWindow(WindowPtr pWin)
DBG("CreateWindow\n");
- pWin->devPrivates[fbWinPrivateIndex].ptr = (pointer) pScrPriv->pPixmap;
+ pWin->devPrivates[fbWinPrivateIndex].ptr = (void *) pScrPriv->pPixmap;
PRINT_RECTS(pScrPriv->region);
if (!pWin->parent) {
REGION_EMPTY (pWin->drawable.pScreen, &pScrPriv->region);
@@ -962,15 +962,15 @@ xxGetWindowRegion(WindowPtr pWin,RegionPtr winreg)
}
static int
-xxUpdateRegion(WindowPtr pWin, pointer unused)
+xxUpdateRegion(WindowPtr pWin, void * unused)
{
ScreenPtr pScreen = pWin->drawable.pScreen;
xxScrPriv(pScreen);
- ColormapPtr pmap = (pointer) -1;
+ ColormapPtr pmap = (void *) -1;
RegionRec winreg, rgni;
if (pScrPriv->myDepth == pWin->drawable.depth) {
- xxCmapPrivPtr pCmapPriv = (pointer)-1;
+ xxCmapPrivPtr pCmapPriv = (void *)-1;
xxGetWindowRegion(pWin,&winreg);
if (pScrPriv->colormapDirty) {
@@ -980,7 +980,7 @@ xxUpdateRegion(WindowPtr pWin, pointer unused)
goto CONTINUE; /* return ? */
pCmapPriv = xxGetCmapPriv(pmap);
- if (pCmapPriv == (pointer) -1)
+ if (pCmapPriv == (void *) -1)
return WT_WALKCHILDREN;
if (!pCmapPriv->dirty)
goto CONTINUE;
@@ -997,7 +997,7 @@ xxUpdateRegion(WindowPtr pWin, pointer unused)
REGION_INTERSECT (pScreen, &rgni, &winreg, &pScrPriv->region);
if (REGION_NOTEMPTY (pScreen,&rgni)) {
- if (pmap == (pointer) -1) {
+ if (pmap == (void *) -1) {
pmap =
(ColormapPtr)LookupIDByType(wColormap(pWin),RT_COLORMAP);
if (!pmap) /* return ? */
@@ -1006,7 +1006,7 @@ xxUpdateRegion(WindowPtr pWin, pointer unused)
pCmapPriv = xxGetCmapPriv(pmap);
}
- if (pCmapPriv != (pointer)-1)
+ if (pCmapPriv != (void *)-1)
xxCopyPseudocolorRegion(pScreen,&rgni, pCmapPriv);
REGION_SUBTRACT(pScreen, &pScrPriv->region, &pScrPriv->region,
&rgni);
@@ -1034,13 +1034,13 @@ xxUpdateFb(ScreenPtr pScreen)
WalkTree(pScreen,xxUpdateRegion,NULL);
#if 0
if (REGION_NOTEMPTY (pScreen,&pScrPriv->region)) {
- ColormapPtr pmap = (pointer) -1;
+ ColormapPtr pmap = (void *) -1;
xxCmapPrivPtr pCmapPriv;
pmap = (ColormapPtr)LookupIDByType(pScreen->defColormap,
RT_COLORMAP);
pCmapPriv = xxGetCmapPriv(pmap);
- if (pCmapPriv != (pointer)-1)
+ if (pCmapPriv != (void *)-1)
xxCopyPseudocolorRegion(pScreen,&pScrPriv->region, pCmapPriv);
REGION_SUBTRACT(pScreen, &pScrPriv->region, &pScrPriv->region,
&pScrPriv->region);
@@ -1064,9 +1064,9 @@ xxUpdateFb(ScreenPtr pScreen)
}
static void
-xxBlockHandler (pointer data,
+xxBlockHandler (void * data,
OSTimePtr pTimeout,
- pointer pRead)
+ void * pRead)
{
ScreenPtr pScreen = (ScreenPtr) data;
xxScrPriv(pScreen);
@@ -1076,7 +1076,7 @@ xxBlockHandler (pointer data,
}
static void
-xxWakeupHandler (pointer data, int i, pointer LastSelectMask)
+xxWakeupHandler (void * data, int i, void * LastSelectMask)
{
}
@@ -1158,7 +1158,7 @@ xxSetup(ScreenPtr pScreen, int myDepth, int baseDepth, char* addr, xxSyncFunc sy
if (!RegisterBlockAndWakeupHandlers (xxBlockHandler,
xxWakeupHandler,
- (pointer) pScreen))
+ (void *) pScreen))
return FALSE;
wrap (pScrPriv, pScreen, CloseScreen, xxCloseScreen);
@@ -1184,7 +1184,7 @@ xxSetup(ScreenPtr pScreen, int myDepth, int baseDepth, char* addr, xxSyncFunc sy
}
#endif
pScrPriv->addr = addr;
- pScreen->devPrivates[xxScrPrivateIndex].ptr = (pointer) pScrPriv;
+ pScreen->devPrivates[xxScrPrivateIndex].ptr = (void *) pScrPriv;
pDefMap = (ColormapPtr) LookupIDByType(pScreen->defColormap, RT_COLORMAP);
if (!xxInitColormapPrivate(pDefMap))
@@ -1341,7 +1341,7 @@ static void
xxChangeClip (
GCPtr pGC,
int type,
- pointer pvalue,
+ void * pvalue,
int nrects
){
XX_GC_FUNC_PROLOGUE (pGC);
@@ -2114,7 +2114,7 @@ xxImageGlyphBlt(
int x, int y,
unsigned int nglyph,
CharInfoPtr *ppci,
- pointer pglyphBase
+ void * pglyphBase
){
XX_GC_OP_PROLOGUE(pGC, pDraw);
(*pGC->ops->ImageGlyphBlt)(pDraw, pGC, x, y, nglyph,
@@ -2162,7 +2162,7 @@ xxPolyGlyphBlt(
int x, int y,
unsigned int nglyph,
CharInfoPtr *ppci,
- pointer pglyphBase
+ void * pglyphBase
){
XX_GC_OP_PROLOGUE(pGC, pDraw);
(*pGC->ops->PolyGlyphBlt)(pDraw, pGC, x, y, nglyph,
diff --git a/nx-X11/programs/Xserver/fb/fbscreen.c b/nx-X11/programs/Xserver/fb/fbscreen.c
index 70d3d7a13..342fd5784 100644
--- a/nx-X11/programs/Xserver/fb/fbscreen.c
+++ b/nx-X11/programs/Xserver/fb/fbscreen.c
@@ -97,14 +97,14 @@ _fbSetWindowPixmap (WindowPtr pWindow, PixmapPtr pPixmap)
#ifdef FB_NO_WINDOW_PIXMAPS
FatalError ("Attempted to set window pixmap without fb support\n");
#else
- pWindow->devPrivates[fbWinPrivateIndex].ptr = (pointer) pPixmap;
+ pWindow->devPrivates[fbWinPrivateIndex].ptr = (void *) pPixmap;
#endif
}
#endif
Bool
fbSetupScreen(ScreenPtr pScreen,
- pointer pbits, /* pointer to screen bitmap */
+ void * pbits, /* pointer to screen bitmap */
int xsize, /* in pixels */
int ysize,
int dpix, /* dots per inch */
@@ -160,7 +160,7 @@ fbSetupScreen(ScreenPtr pScreen,
Bool
fbFinishScreenInit(ScreenPtr pScreen,
- pointer pbits,
+ void * pbits,
int xsize,
int ysize,
int dpix,
@@ -261,7 +261,7 @@ fbFinishScreenInit(ScreenPtr pScreen,
/* dts * (inch/dot) * (25.4 mm / inch) = mm */
Bool
fbScreenInit(ScreenPtr pScreen,
- pointer pbits,
+ void * pbits,
int xsize,
int ysize,
int dpix,
diff --git a/nx-X11/programs/Xserver/fb/fbwindow.c b/nx-X11/programs/Xserver/fb/fbwindow.c
index 0cfefa929..1269902b9 100644
--- a/nx-X11/programs/Xserver/fb/fbwindow.c
+++ b/nx-X11/programs/Xserver/fb/fbwindow.c
@@ -38,7 +38,7 @@ fbCreateWindow(WindowPtr pWin)
{
#ifndef FB_NO_WINDOW_PIXMAPS
pWin->devPrivates[fbWinPrivateIndex].ptr =
- (pointer) fbGetScreenPixmap(pWin->drawable.pScreen);
+ (void *) fbGetScreenPixmap(pWin->drawable.pScreen);
#endif
#ifdef FB_SCREEN_PRIVATE
if (pWin->drawable.bitsPerPixel == 32)
--
cgit v1.2.3