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/miext/cw/cw_ops.c | |
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/miext/cw/cw_ops.c')
-rw-r--r-- | nx-X11/programs/Xserver/miext/cw/cw_ops.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/miext/cw/cw_ops.c b/nx-X11/programs/Xserver/miext/cw/cw_ops.c index 567a8c93c..9e09d0532 100644 --- a/nx-X11/programs/Xserver/miext/cw/cw_ops.c +++ b/nx-X11/programs/Xserver/miext/cw/cw_ops.c @@ -96,10 +96,10 @@ static void cwImageText16(DrawablePtr pDst, GCPtr pGC, int x, int y, int count, unsigned short *chars); static void cwImageGlyphBlt(DrawablePtr pDst, GCPtr pGC, int x, int y, unsigned int nglyph, CharInfoPtr *ppci, - pointer pglyphBase); + void * pglyphBase); static void cwPolyGlyphBlt(DrawablePtr pDst, GCPtr pGC, int x, int y, unsigned int nglyph, CharInfoPtr *ppci, - pointer pglyphBase); + void * pglyphBase); static void cwPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDst, int w, int h, int x, int y); @@ -422,7 +422,7 @@ cwImageText16(DrawablePtr pDst, GCPtr pGC, int x, int y, int count, static void cwImageGlyphBlt(DrawablePtr pDst, GCPtr pGC, int x, int y, unsigned int nglyph, - CharInfoPtr *ppci, pointer pglyphBase) + CharInfoPtr *ppci, void * pglyphBase) { SETUP_BACKING_DST(pDst, pGC); @@ -438,7 +438,7 @@ cwImageGlyphBlt(DrawablePtr pDst, GCPtr pGC, int x, int y, unsigned int nglyph, static void cwPolyGlyphBlt(DrawablePtr pDst, GCPtr pGC, int x, int y, unsigned int nglyph, - CharInfoPtr *ppci, pointer pglyphBase) + CharInfoPtr *ppci, void * pglyphBase) { SETUP_BACKING_DST(pDst, pGC); |