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 | |
| 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')
| -rw-r--r-- | src/bitmap/bdfread.c | 2 | ||||
| -rw-r--r-- | src/bitmap/bdfutils.c | 2 | ||||
| -rw-r--r-- | src/bitmap/bitscale.c | 8 | ||||
| -rw-r--r-- | src/bitmap/pcfread.c | 5 | ||||
| -rw-r--r-- | src/bitmap/snfread.c | 3 |
5 files changed, 1 insertions, 19 deletions
diff --git a/src/bitmap/bdfread.c b/src/bitmap/bdfread.c index a6f0c1e..f9a3a5f 100644 --- a/src/bitmap/bdfread.c +++ b/src/bitmap/bdfread.c @@ -56,9 +56,7 @@ from The Open Group. #include <config.h> #endif -#ifndef FONTMODULE #include <ctype.h> -#endif #include <X11/fonts/fntfilst.h> #include <X11/fonts/fontutil.h> /* use bitmap structure */ diff --git a/src/bitmap/bdfutils.c b/src/bitmap/bdfutils.c index a0c5ae9..61406b8 100644 --- a/src/bitmap/bdfutils.c +++ b/src/bitmap/bdfutils.c @@ -55,11 +55,9 @@ from The Open Group. #include <config.h> #endif -#ifndef FONTMODULE #include <ctype.h> #include <stdio.h> #include <stdarg.h> -#endif #include <X11/fonts/fntfilst.h> #include <X11/fonts/fontstruct.h> diff --git a/src/bitmap/bitscale.c b/src/bitmap/bitscale.c index ffdbe1d..63e4f37 100644 --- a/src/bitmap/bitscale.c +++ b/src/bitmap/bitscale.c @@ -55,15 +55,7 @@ from The Open Group. #include <X11/fonts/fntfilst.h> #include <X11/fonts/bitmap.h> #include <X11/fonts/fontutil.h> -#ifndef FONTMODULE -#ifdef _XOPEN_SOURCE #include <math.h> -#else -#define _XOPEN_SOURCE /* to get prototype for hypot on some systems */ -#include <math.h> -#undef _XOPEN_SOURCE -#endif -#endif #ifndef MAX #define MAX(a,b) (((a)>(b)) ? a : b) 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) { diff --git a/src/bitmap/snfread.c b/src/bitmap/snfread.c index f48e2d8..b35073b 100644 --- a/src/bitmap/snfread.c +++ b/src/bitmap/snfread.c @@ -55,10 +55,7 @@ from The Open Group. #include <config.h> #endif -#ifndef FONTMODULE #include <ctype.h> -#endif - #include <X11/fonts/fntfilst.h> #include <X11/fonts/bitmap.h> #include "snfstr.h" |