diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 12:47:39 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 12:47:39 +0000 |
| commit | cb897b8ffca0a68c017c2edfa523cb5ff0491962 (patch) | |
| tree | 8b4e9e320258d5280ce454163c49363030626c1a /libX11/src/Font.c | |
| parent | 213d71f78d6f9e35b23c00e35f9919efc9670b1e (diff) | |
| parent | c87efef42f76c2ff0dcfad2842ab369beffd21de (diff) | |
| download | vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.gz vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.bz2 vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'libX11/src/Font.c')
| -rw-r--r-- | libX11/src/Font.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libX11/src/Font.c b/libX11/src/Font.c index 5165d5e62..244cd2d72 100644 --- a/libX11/src/Font.c +++ b/libX11/src/Font.c @@ -153,7 +153,7 @@ int XFreeFont( register Display *dpy, XFontStruct *fs) -{ +{ register xResourceReq *req; register _XExtension *ext; @@ -230,7 +230,7 @@ _XQueryFont ( fs->all_chars_exist = reply.allCharsExist; fs->ascent = cvtINT16toInt (reply.fontAscent); fs->descent = cvtINT16toInt (reply.fontDescent); - + #ifdef MUSTCOPY { xCharInfo *xcip; @@ -258,7 +258,7 @@ _XQueryFont ( #endif /* MUSTCOPY */ fs->n_properties = reply.nFontProps; - /* + /* * if no properties defined for the font, then it is bad * font, but shouldn't try to read nothing. */ @@ -290,7 +290,7 @@ _XQueryFont ( (reply.nCharInfos * SIZEOF(xCharInfo))); return (XFontStruct *)NULL; } - + #ifdef MUSTCOPY { register XCharStruct *cs = fs->per_char; @@ -516,7 +516,7 @@ _XF86BigfontQueryFont ( fs->max_bounds = * (XCharStruct *) &reply.maxBounds; fs->n_properties = reply.nFontProps; - /* + /* * if no properties defined for the font, then it is bad * font, but shouldn't try to read nothing. */ |