diff options
| author | marha <marha@users.sourceforge.net> | 2014-01-15 21:37:10 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-01-15 21:37:10 +0100 |
| commit | b7f01cb1f6cfd1ec301f650a073436c91ec614aa (patch) | |
| tree | 1dbf32344313ad7e5884e6686251cad398a231fa /xorg-server/mi/miglblt.c | |
| parent | 7b4b94b4449aec056c4c92f5cacc2f89a292a80e (diff) | |
| parent | 1b0fcca503ae9cf2d462b60770f96c794dfbb27a (diff) | |
| download | vcxsrv-b7f01cb1f6cfd1ec301f650a073436c91ec614aa.tar.gz vcxsrv-b7f01cb1f6cfd1ec301f650a073436c91ec614aa.tar.bz2 vcxsrv-b7f01cb1f6cfd1ec301f650a073436c91ec614aa.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa xkeyboard-config xserver git update 15 jan 2014
randrproto libfontenc mesa xserver git update 10 Jan 2014
randsrproto fontconfig libX11 git update 6 Jan 2014
Conflicts:
mesalib/src/glsl/builtin_functions.cpp
mesalib/src/glsl/ir_builder.h
xorg-server/Xext/xres.c
xorg-server/dix/dispatch.c
xorg-server/dix/dixfonts.c
xorg-server/hw/xwin/wingc.c
xorg-server/hw/xwin/winwindowswm.c
xorg-server/include/gc.h
xorg-server/os/access.c
Diffstat (limited to 'xorg-server/mi/miglblt.c')
| -rw-r--r-- | xorg-server/mi/miglblt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/mi/miglblt.c b/xorg-server/mi/miglblt.c index 1a70911fa..b53ab9c0e 100644 --- a/xorg-server/mi/miglblt.c +++ b/xorg-server/mi/miglblt.c @@ -81,7 +81,7 @@ with the sample server. void miPolyGlyphBlt(DrawablePtr pDrawable, GC * pGC, int x, int y, unsigned int nglyph, CharInfoPtr * ppci, /* array of character info */ - pointer pglyphBase /* start of array of glyphs */ + void *pglyphBase /* start of array of glyphs */ ) { int width, height; @@ -182,7 +182,7 @@ miPolyGlyphBlt(DrawablePtr pDrawable, GC * pGC, int x, int y, unsigned int nglyp void miImageGlyphBlt(DrawablePtr pDrawable, GC * pGC, int x, int y, unsigned int nglyph, CharInfoPtr * ppci, /* array of character info */ - pointer pglyphBase /* start of array of glyphs */ + void *pglyphBase /* start of array of glyphs */ ) { ExtentInfoRec info; /* used by QueryGlyphExtents() */ |