diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-03-14 01:30:24 -0300 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2008-12-19 16:22:29 -0800 |
| commit | b6f793d7d5c7f7c55911e6524dede41b92dcbc22 (patch) | |
| tree | a048c9f15315c72ae8e157c83bba9c186a09c491 /src/bitmap/pcfread.c | |
| parent | 282ac4226195d58e3818e7ac97093e396aa78086 (diff) | |
libXfont ansification and removal of xf86_ansic.h dependency
Basically the code is now compiled as if FONTMODULE was never defined,
but also removed some "magic" defining _XOPEN_SOURCE before including
math.h.
Also removed some #if 0'ed code instead of fixing prototypes inside
the "dead code".
Changes to spdo_prv.h were due to defines like:
<hash>define foo() sp_foo()
that would not compile with the ansification in the format:
type foo(void)
due to the macro receiving "void" as an argument.
Diffstat (limited to 'src/bitmap/pcfread.c')
| -rw-r--r-- | src/bitmap/pcfread.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/bitmap/pcfread.c b/src/bitmap/pcfread.c index c5db255..3a0eeeb 100644 --- a/src/bitmap/pcfread.c +++ b/src/bitmap/pcfread.c @@ -868,11 +868,8 @@ pmfReadFont(FontPtr pFont, FontFilePtr file, pci++; } -#ifdef FONTMODULE - sizebitmaps = 1024; /* Default - we xalloc the size anyway */ -#else sizebitmaps = BUFSIZ; -#endif + /* guard against completely empty font */ bitmaps = (char *) xalloc(sizebitmaps); if (!bitmaps) { |