aboutsummaryrefslogtreecommitdiff
path: root/libX11/src/FontInfo.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-07-25 12:47:39 +0000
committermarha <marha@users.sourceforge.net>2009-07-25 12:47:39 +0000
commitcb897b8ffca0a68c017c2edfa523cb5ff0491962 (patch)
tree8b4e9e320258d5280ce454163c49363030626c1a /libX11/src/FontInfo.c
parent213d71f78d6f9e35b23c00e35f9919efc9670b1e (diff)
parentc87efef42f76c2ff0dcfad2842ab369beffd21de (diff)
downloadvcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.gz
vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.bz2
vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.zip
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'libX11/src/FontInfo.c')
-rw-r--r--libX11/src/FontInfo.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libX11/src/FontInfo.c b/libX11/src/FontInfo.c
index 0a741b938..796dcccdc 100644
--- a/libX11/src/FontInfo.c
+++ b/libX11/src/FontInfo.c
@@ -47,7 +47,7 @@ _Xconst char *pattern, /* null-terminated */
int maxNames,
int *actualCount, /* RETURN */
XFontStruct **info) /* RETURN */
-{
+{
register long nbytes;
register int i;
register XFontStruct *fs;
@@ -68,7 +68,7 @@ XFontStruct **info) /* RETURN */
for (i = 0; ; i++) {
if (!_XReply (dpy, (xReply *) &reply,
- ((SIZEOF(xListFontsWithInfoReply) -
+ ((SIZEOF(xListFontsWithInfoReply) -
SIZEOF(xGenericReply)) >> 2), xFalse)) {
for (j=(i-1); (j >= 0); j--) {
Xfree(flist[j]);
@@ -86,7 +86,7 @@ XFontStruct **info) /* RETURN */
size = i + reply.nReplies + 1;
if (finfo) {
- XFontStruct * tmp_finfo = (XFontStruct *)
+ XFontStruct * tmp_finfo = (XFontStruct *)
Xrealloc ((char *) finfo,
(unsigned) (sizeof(XFontStruct) * size));
char ** tmp_flist = (char **)
@@ -134,7 +134,7 @@ XFontStruct **info) /* RETURN */
fs->all_chars_exist = reply.allCharsExist;
fs->ascent = cvtINT16toInt (reply.fontAscent);
fs->descent = cvtINT16toInt (reply.fontDescent);
-
+
#ifdef MUSTCOPY
{
xCharInfo *xcip;