diff options
author | Keith Packard <keithp@keithp.com> | 2015-06-22 09:36:08 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-12-28 12:54:40 +0100 |
commit | 68dd0b52e13c844d662192654fb10cb993257a59 (patch) | |
tree | a97ab98a06147cd5fb194063a9984dc3973fba55 /nx-X11/programs/Xserver/hw/nxagent/Colormap.c | |
parent | e9f44221b2520a1d894b3c125269b5d10438453b (diff) | |
download | nx-libs-68dd0b52e13c844d662192654fb10cb993257a59.tar.gz nx-libs-68dd0b52e13c844d662192654fb10cb993257a59.tar.bz2 nx-libs-68dd0b52e13c844d662192654fb10cb993257a59.zip |
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>
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Colormap.c')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Colormap.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Colormap.c b/nx-X11/programs/Xserver/hw/nxagent/Colormap.c index fbe52db9c..3a47e270e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Colormap.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Colormap.c @@ -77,7 +77,7 @@ Bool nxagentCreateColormap(ColormapPtr pCmap) pVisual = pCmap->pVisual; ncolors = pVisual->ColormapEntries; - pCmap->devPriv = (pointer)xalloc(sizeof(nxagentPrivColormap)); + pCmap->devPriv = (void *)xalloc(sizeof(nxagentPrivColormap)); if (((visual = nxagentVisual(pVisual))) == NULL) { @@ -174,7 +174,7 @@ void nxagentDestroyColormap(ColormapPtr pCmap) #define SEARCH_PREDICATE \ (nxagentWindow(pWin) != None && wColormap(pWin) == icws->cmapIDs[i]) -static int nxagentCountInstalledColormapWindows(WindowPtr pWin, pointer ptr) +static int nxagentCountInstalledColormapWindows(WindowPtr pWin, void * ptr) { nxagentInstalledColormapWindows *icws = (nxagentInstalledColormapWindows *) ptr; @@ -189,7 +189,7 @@ static int nxagentCountInstalledColormapWindows(WindowPtr pWin, pointer ptr) return WT_WALKCHILDREN; } -static int nxagentGetInstalledColormapWindows(WindowPtr pWin, pointer ptr) +static int nxagentGetInstalledColormapWindows(WindowPtr pWin, void * ptr) { nxagentInstalledColormapWindows *icws = (nxagentInstalledColormapWindows *)ptr; int i; @@ -233,11 +233,11 @@ void nxagentSetInstalledColormapWindows(ScreenPtr pScreen) sizeof(Colormap)); icws.numCmapIDs = nxagentListInstalledColormaps(pScreen, icws.cmapIDs); icws.numWindows = 0; - WalkTree(pScreen, nxagentCountInstalledColormapWindows, (pointer)&icws); + WalkTree(pScreen, nxagentCountInstalledColormapWindows, (void *)&icws); if (icws.numWindows) { icws.windows = (Window *)xalloc((icws.numWindows + 1) * sizeof(Window)); icws.index = 0; - WalkTree(pScreen, nxagentGetInstalledColormapWindows, (pointer)&icws); + WalkTree(pScreen, nxagentGetInstalledColormapWindows, (void *)&icws); icws.windows[icws.numWindows] = nxagentDefaultWindows[pScreen->myNum]; numWindows = icws.numWindows + 1; } @@ -388,10 +388,10 @@ void nxagentInstallColormap(ColormapPtr pCmap) /* Uninstall pInstalledMap. Notify all interested parties. */ if(pOldCmap != (ColormapPtr)None) - WalkTree(pCmap->pScreen, TellLostMap, (pointer)&pOldCmap->mid); + WalkTree(pCmap->pScreen, TellLostMap, (void *)&pOldCmap->mid); InstalledMaps[index] = pCmap; - WalkTree(pCmap->pScreen, TellGainedMap, (pointer)&pCmap->mid); + WalkTree(pCmap->pScreen, TellGainedMap, (void *)&pCmap->mid); nxagentSetInstalledColormapWindows(pCmap->pScreen); nxagentDirectInstallColormaps(pCmap->pScreen); @@ -542,7 +542,7 @@ Bool nxagentCreateDefaultColormap(ScreenPtr pScreen) return True; } -static void nxagentReconnectColormap(pointer p0, XID x1, pointer p2) +static void nxagentReconnectColormap(void * p0, XID x1, void * p2) { ColormapPtr pCmap = (ColormapPtr)p0; Bool* pBool = (Bool*)p2; |