aboutsummaryrefslogtreecommitdiff
path: root/libXfont/src/util/private.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-09-21 18:14:18 +0200
committermarha <marha@users.sourceforge.net>2014-09-21 18:14:18 +0200
commit4e080e0165d18887e2a0fccd7f30cf20fd04b178 (patch)
treedbefa5addb60abe7a5c52dbc1daea7d6e0c9d4d0 /libXfont/src/util/private.c
parente16399e57caac9e859a7d28921c73ef9839b571e (diff)
parentd0f70707dde032e662dbd5bc70df6ac915403abe (diff)
downloadvcxsrv-4e080e0165d18887e2a0fccd7f30cf20fd04b178.tar.gz
vcxsrv-4e080e0165d18887e2a0fccd7f30cf20fd04b178.tar.bz2
vcxsrv-4e080e0165d18887e2a0fccd7f30cf20fd04b178.zip
Merge remote-tracking branch 'origin/released'
Conflicts: libXfont/src/fontfile/fontfile.c libXfont/src/util/utilbitmap.c
Diffstat (limited to 'libXfont/src/util/private.c')
-rw-r--r--libXfont/src/util/private.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libXfont/src/util/private.c b/libXfont/src/util/private.c
index 36715b1fa..e55e19368 100644
--- a/libXfont/src/util/private.c
+++ b/libXfont/src/util/private.c
@@ -42,7 +42,7 @@ AllocateFontPrivateIndex (void)
return _FontPrivateAllocateIndex++;
}
-FontPtr
+FontPtr
CreateFontRec (void)
{
FontPtr pFont;
@@ -51,7 +51,7 @@ CreateFontRec (void)
size = sizeof(FontRec) + (sizeof(pointer) * _FontPrivateAllocateIndex);
pFont = malloc(size);
-
+
if(pFont) {
bzero((char*)pFont, size);
pFont->maxPrivate = _FontPrivateAllocateIndex - 1;