diff options
author | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
commit | 2553bdd7c359cd87525d367761c86932cec5adff (patch) | |
tree | ae71245933c98474a699d3e392de5820879b2018 /xorg-server/mi/mipolytext.c | |
parent | e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff) | |
parent | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff) | |
download | vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2 vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/mi/mipolytext.c')
-rw-r--r-- | xorg-server/mi/mipolytext.c | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/xorg-server/mi/mipolytext.c b/xorg-server/mi/mipolytext.c index 82b16f7d2..7be40aef1 100644 --- a/xorg-server/mi/mipolytext.c +++ b/xorg-server/mi/mipolytext.c @@ -67,12 +67,7 @@ SOFTWARE. #include "mi.h" _X_EXPORT int -miPolyText8(pDraw, pGC, x, y, count, chars) - DrawablePtr pDraw; - GCPtr pGC; - int x, y; - int count; - char *chars; +miPolyText8(DrawablePtr pDraw, GCPtr pGC, int x, int y, int count, char *chars) { unsigned long n, i; int w; @@ -89,12 +84,7 @@ miPolyText8(pDraw, pGC, x, y, count, chars) } _X_EXPORT int -miPolyText16(pDraw, pGC, x, y, count, chars) - DrawablePtr pDraw; - GCPtr pGC; - int x, y; - int count; - unsigned short *chars; +miPolyText16(DrawablePtr pDraw, GCPtr pGC, int x, int y, int count, unsigned short *chars) { unsigned long n, i; int w; @@ -112,12 +102,7 @@ miPolyText16(pDraw, pGC, x, y, count, chars) } _X_EXPORT void -miImageText8(pDraw, pGC, x, y, count, chars) - DrawablePtr pDraw; - GCPtr pGC; - int x, y; - int count; - char *chars; +miImageText8(DrawablePtr pDraw, GCPtr pGC, int x, int y, int count, char *chars) { unsigned long n; FontPtr font = pGC->font; @@ -130,12 +115,8 @@ miImageText8(pDraw, pGC, x, y, count, chars) } _X_EXPORT void -miImageText16(pDraw, pGC, x, y, count, chars) - DrawablePtr pDraw; - GCPtr pGC; - int x, y; - int count; - unsigned short *chars; +miImageText16(DrawablePtr pDraw, GCPtr pGC, int x, int y, + int count, unsigned short *chars) { unsigned long n; FontPtr font = pGC->font; |