summaryrefslogtreecommitdiff
path: root/src/util/fontaccel.c
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-17 19:03:42 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-17 19:03:42 +0000
commit94817d4f3277d927bf96431c24033d8cd67d9a30 (patch)
tree2e4b857f2103cfbcdfcfd53b47334166e139a273 /src/util/fontaccel.c
parent3795e9702b3b3a6fe0594d09cdd110adeb5e42f9 (diff)
merge XFree86 4.3.0.1 to -CURRENT
Diffstat (limited to 'src/util/fontaccel.c')
-rw-r--r--src/util/fontaccel.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/util/fontaccel.c b/src/util/fontaccel.c
index b0e8b57..f922145 100644
--- a/src/util/fontaccel.c
+++ b/src/util/fontaccel.c
@@ -27,6 +27,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
+/* $XFree86: xc/lib/font/util/fontaccel.c,v 1.7 2001/12/14 19:56:56 dawes Exp $ */
/*
* Author: Keith Packard, MIT X Consortium
@@ -34,9 +35,10 @@ from The Open Group.
#include "fontmisc.h"
#include "fontstruct.h"
+#include "fontutil.h"
-void FontComputeInfoAccelerators(pFontInfo)
- FontInfoPtr pFontInfo;
+void
+FontComputeInfoAccelerators(FontInfoPtr pFontInfo)
{
pFontInfo->noOverlap = FALSE;
if (pFontInfo->maxOverlap <= pFontInfo->minbounds.leftSideBearing)
@@ -80,8 +82,8 @@ void FontComputeInfoAccelerators(pFontInfo)
pFontInfo->inkInside = FALSE;
}
-int FontCouldBeTerminal(pFontInfo)
- FontInfoPtr pFontInfo;
+int
+FontCouldBeTerminal(FontInfoPtr pFontInfo)
{
if ((pFontInfo->minbounds.leftSideBearing >= 0) &&
(pFontInfo->maxbounds.rightSideBearing <= pFontInfo->maxbounds.characterWidth) &&