diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-12-28 13:03:52 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-12-28 13:03:52 +0100 |
| commit | edce25213ffc81389909c827c9aaac27b736b483 (patch) | |
| tree | a97ab98a06147cd5fb194063a9984dc3973fba55 /nx-X11/programs/Xserver/include/colormap.h | |
| parent | e9f44221b2520a1d894b3c125269b5d10438453b (diff) | |
| parent | 68dd0b52e13c844d662192654fb10cb993257a59 (diff) | |
| download | nx-libs-edce25213ffc81389909c827c9aaac27b736b483.tar.gz nx-libs-edce25213ffc81389909c827c9aaac27b736b483.tar.bz2 nx-libs-edce25213ffc81389909c827c9aaac27b736b483.zip | |
Merge branch 'sunweaver-pr/change-pointer-into-void' into 3.6.x
Attributes GH PR #54: https://github.com/ArcticaProject/nx-libs/pull/54
Diffstat (limited to 'nx-X11/programs/Xserver/include/colormap.h')
| -rw-r--r-- | nx-X11/programs/Xserver/include/colormap.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/include/colormap.h b/nx-X11/programs/Xserver/include/colormap.h index 1f2c33075..d519bb782 100644 --- a/nx-X11/programs/Xserver/include/colormap.h +++ b/nx-X11/programs/Xserver/include/colormap.h @@ -87,16 +87,16 @@ extern int CreateColormap( int /*client*/); extern int FreeColormap( - pointer /*pmap*/, + void * /*pmap*/, XID /*mid*/); extern int TellLostMap( WindowPtr /*pwin*/, - pointer /* Colormap *pmid */); + void * /* Colormap *pmid */); extern int TellGainedMap( WindowPtr /*pwin*/, - pointer /* Colormap *pmid */); + void * /* Colormap *pmid */); extern int CopyColormapAndFree( Colormap /*mid*/, @@ -140,7 +140,7 @@ extern int QueryColors( xrgb* /*prgbList*/); extern int FreeClientPixels( - pointer /*pcr*/, + void * /*pcr*/, XID /*fakeid*/); extern int AllocColorCells( |