diff options
author | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-23 21:34:47 +0000 |
---|---|---|
committer | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-23 21:34:47 +0000 |
commit | 9fb403503248fea923533300380cfc4bbb45823a (patch) | |
tree | 865b140bbcf32a702c27128105fe6af69a546246 /src/Type1/t1funcs.c | |
parent | ed2a4fae8e3a436b4177d68f95b98a5b2ae26b0a (diff) |
merge most of XFree86 RC3 (4.3.99.903) from vendor branch. bug #214XORG-RELEASE-1-BASEXEVIE-MERGEXINERAMA_2
Diffstat (limited to 'src/Type1/t1funcs.c')
-rw-r--r-- | src/Type1/t1funcs.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/Type1/t1funcs.c b/src/Type1/t1funcs.c index 70da203..087c7e5 100644 --- a/src/Type1/t1funcs.c +++ b/src/Type1/t1funcs.c @@ -71,7 +71,7 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/t1funcs.c,v 3.33 2003/07/19 13:16:40 tsi Exp $ */ +/* $XFree86: xc/lib/font/Type1/t1funcs.c,v 3.34 2004/02/02 03:55:27 dawes Exp $ */ /* @@ -123,10 +123,14 @@ from The Open Group. #else #include "Xmd.h" #include "Xdefs.h" -#include "xf86_ansic.h" #endif #include "os.h" + +#ifdef FONTMODULE +#include "xf86_ansic.h" +#endif + #include "fntfilst.h" #include "fontutil.h" #include "FSproto.h" |