diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:42 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:42 +0000 |
| commit | 94817d4f3277d927bf96431c24033d8cd67d9a30 (patch) | |
| tree | 2e4b857f2103cfbcdfcfd53b47334166e139a273 /src/util/format.c | |
| parent | 3795e9702b3b3a6fe0594d09cdd110adeb5e42f9 (diff) | |
merge XFree86 4.3.0.1 to -CURRENT
Diffstat (limited to 'src/util/format.c')
| -rw-r--r-- | src/util/format.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/util/format.c b/src/util/format.c index 615f0ee..c406009 100644 --- a/src/util/format.c +++ b/src/util/format.c @@ -50,19 +50,21 @@ other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/font/util/format.c,v 1.5 2001/12/14 19:56:57 dawes Exp $ */ #include "FSproto.h" #include "font.h" +#include "fontstruct.h" +#include "fontutil.h" int -CheckFSFormat(format, fmask, bit_order, byte_order, scan, glyph, image) - fsBitmapFormat format; - fsBitmapFormatMask fmask; - int *bit_order, - *byte_order, - *scan, - *glyph, - *image; +CheckFSFormat(fsBitmapFormat format, + fsBitmapFormatMask fmask, + int *bit_order, + int *byte_order, + int *scan, + int *glyph, + int *image) { /* convert format to what the low levels want */ if (fmask & BitmapFormatMaskBit) { |