From 932edb23b47440397447265bf72ad7932fd80070 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Sun, 3 Jul 2005 07:01:01 +0000 Subject: Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings. Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings. Add #include or , as appropriate, to all source files in the xserver/xorg tree, predicated on defines of HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to . --- include/X11/fonts/bitmap.h | 2 +- include/X11/fonts/fntfil.h | 2 +- include/X11/fonts/fntfilio.h | 2 +- include/X11/fonts/fntfilst.h | 6 +++--- src/FreeType/ftenc.c | 8 ++++---- src/FreeType/ftfuncs.c | 10 +++++----- src/FreeType/fttools.c | 2 +- src/FreeType/xttcap.c | 2 +- src/Speedo/spfile.c | 4 ++-- src/Speedo/spfont.c | 2 +- src/Speedo/spfuncs.c | 4 ++-- src/Speedo/spglyph.c | 2 +- src/Speedo/spinfo.c | 4 ++-- src/Speedo/spint.h | 2 +- src/Type1/afm.c | 2 +- src/Type1/cidchar.c | 2 +- src/Type1/fontfcn.c | 2 +- src/Type1/scanfont.c | 2 +- src/Type1/t1funcs.c | 4 ++-- src/Type1/t1info.c | 4 ++-- src/Type1/util.c | 2 +- src/bitmap/bdfread.c | 6 +++--- src/bitmap/bdfutils.c | 4 ++-- src/bitmap/bitmap.c | 4 ++-- src/bitmap/bitmapfunc.c | 6 +++--- src/bitmap/bitmaputil.c | 4 ++-- src/bitmap/bitscale.c | 6 +++--- src/bitmap/fontink.c | 4 ++-- src/bitmap/pcfread.c | 4 ++-- src/bitmap/pcfwrite.c | 4 ++-- src/bitmap/snfread.c | 4 ++-- src/bitmap/snfstr.h | 2 +- src/builtins/builtin.h | 8 ++++---- src/builtins/fpe.c | 2 +- src/builtins/render.c | 2 +- src/fc/fsconvert.c | 4 ++-- src/fc/fserve.c | 4 ++-- src/fc/fsio.c | 2 +- src/fontcache/fontcache.h | 2 +- src/fontfile/bitsource.c | 2 +- src/fontfile/bufio.c | 4 ++-- src/fontfile/decompress.c | 4 ++-- src/fontfile/defaults.c | 2 +- src/fontfile/dirfile.c | 2 +- src/fontfile/ffcheck.c | 6 +++--- src/fontfile/fileio.c | 2 +- src/fontfile/filewr.c | 2 +- src/fontfile/fontdir.c | 4 ++-- src/fontfile/fontencc.c | 2 +- src/fontfile/fontfile.c | 4 ++-- src/fontfile/fontscale.c | 2 +- src/fontfile/gunzip.c | 4 ++-- src/fontfile/printerfont.c | 2 +- src/fontfile/register.c | 8 ++++---- src/fontfile/renderers.c | 2 +- src/stubs/stubs.h | 2 +- src/util/atom.c | 2 +- src/util/fontaccel.c | 4 ++-- src/util/fontnames.c | 2 +- src/util/fontutil.c | 4 ++-- src/util/fontxlfd.c | 6 +++--- src/util/format.c | 2 +- src/util/miscutil.c | 2 +- src/util/patcache.c | 2 +- src/util/private.c | 2 +- src/util/utilbitmap.c | 2 +- 66 files changed, 112 insertions(+), 112 deletions(-) diff --git a/include/X11/fonts/bitmap.h b/include/X11/fonts/bitmap.h index b5df964..e60fda8 100644 --- a/include/X11/fonts/bitmap.h +++ b/include/X11/fonts/bitmap.h @@ -36,7 +36,7 @@ from The Open Group. #ifndef _BITMAP_H_ #define _BITMAP_H_ -#include "fntfilio.h" +#include #ifndef FONTMODULE #include /* just for NULL */ #else diff --git a/include/X11/fonts/fntfil.h b/include/X11/fonts/fntfil.h index 80ec872..81d2cbc 100644 --- a/include/X11/fonts/fntfil.h +++ b/include/X11/fonts/fntfil.h @@ -34,7 +34,7 @@ in this Software without prior written authorization from The Open Group. #ifndef _FONTFILE_H_ #define _FONTFILE_H_ -#include "fontxlfd.h" +#include typedef struct _FontEntry *FontEntryPtr; typedef struct _FontTable *FontTablePtr; diff --git a/include/X11/fonts/fntfilio.h b/include/X11/fonts/fntfilio.h index 30a95c5..f8e24f3 100644 --- a/include/X11/fonts/fntfilio.h +++ b/include/X11/fonts/fntfilio.h @@ -34,7 +34,7 @@ in this Software without prior written authorization from The Open Group. #ifndef _FNTFILIO_H_ #define _FNTFILIO_H_ -#include "bufio.h" +#include typedef BufFilePtr FontFilePtr; diff --git a/include/X11/fonts/fntfilst.h b/include/X11/fonts/fntfilst.h index cfe555a..1a71eae 100644 --- a/include/X11/fonts/fntfilst.h +++ b/include/X11/fonts/fntfilst.h @@ -38,11 +38,11 @@ in this Software without prior written authorization from The Open Group. #include #endif #ifndef XP_PSTEXT -#include "fontmisc.h" +#include #endif #include -#include "fontxlfd.h" -#include "fntfil.h" +#include +#include typedef struct _FontName { char *name; diff --git a/src/FreeType/ftenc.c b/src/FreeType/ftenc.c index 1f75d80..dcd626a 100644 --- a/src/FreeType/ftenc.c +++ b/src/FreeType/ftenc.c @@ -29,12 +29,12 @@ THE SOFTWARE. #include "xf86_ansic.h" #endif -#include "fntfilst.h" -#include "fontutil.h" +#include +#include #include -#include "fontmisc.h" -#include "fontenc.h" +#include +#include #include #include FT_FREETYPE_H #include FT_TRUETYPE_IDS_H diff --git a/src/FreeType/ftfuncs.c b/src/FreeType/ftfuncs.c index 6cdff76..769a27a 100644 --- a/src/FreeType/ftfuncs.c +++ b/src/FreeType/ftfuncs.c @@ -25,11 +25,11 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XdotOrg: xc/lib/font/FreeType/ftfuncs.c,v 1.8 2004/11/02 08:54:52 eich Exp $ */ +/* $XdotOrg: xc/lib/font/FreeType/ftfuncs.c,v 1.10 2005/05/27 17:44:07 josh Exp $ */ /* $XFree86: xc/lib/font/FreeType/ftfuncs.c,v 1.43 2004/02/07 04:37:18 dawes Exp $ */ -#include "fontmisc.h" +#include #ifndef FONTMODULE #include @@ -40,8 +40,8 @@ THE SOFTWARE. #include "xf86_ansic.h" #endif -#include "fntfilst.h" -#include "fontutil.h" +#include +#include #include #include #include FT_FREETYPE_H @@ -64,7 +64,7 @@ THE SOFTWARE. #include FT_OUTLINE_H #endif -#include "fontenc.h" +#include #include "ft.h" #include "ftfuncs.h" #include "xttcap.h" diff --git a/src/FreeType/fttools.c b/src/FreeType/fttools.c index b604771..8302778 100644 --- a/src/FreeType/fttools.c +++ b/src/FreeType/fttools.c @@ -23,7 +23,7 @@ /* $XFree86: xc/lib/font/FreeType/fttools.c,v 1.6 2003/06/08 15:41:13 herrb Exp $ */ -#include "fontmisc.h" +#include #ifndef FONTMODULE #include #include diff --git a/src/FreeType/xttcap.c b/src/FreeType/xttcap.c index 1e2d566..b6e2a24 100644 --- a/src/FreeType/xttcap.c +++ b/src/FreeType/xttcap.c @@ -39,7 +39,7 @@ static char const * const releaseID = _XTT_RELEASE_NAME; */ -#include "fontmisc.h" +#include #ifndef FONTMODULE #include #include diff --git a/src/Speedo/spfile.c b/src/Speedo/spfile.c index ef2a764..c3bd9b4 100644 --- a/src/Speedo/spfile.c +++ b/src/Speedo/spfile.c @@ -51,8 +51,8 @@ from The Open Group. */ /* $XFree86: xc/lib/font/Speedo/spfile.c,v 1.13 2001/08/13 21:46:47 dawes Exp $ */ -#include "fntfilst.h" -#include "fontenc.h" +#include +#include #ifndef FONTMODULE #include #else diff --git a/src/Speedo/spfont.c b/src/Speedo/spfont.c index 684caaf..14d47b7 100644 --- a/src/Speedo/spfont.c +++ b/src/Speedo/spfont.c @@ -57,7 +57,7 @@ from The Open Group. #include #include "spint.h" -#include "fontutil.h" +#include #ifndef FONTMODULE #ifdef _XOPEN_SOURCE #include diff --git a/src/Speedo/spfuncs.c b/src/Speedo/spfuncs.c index 75f779b..840f0e1 100644 --- a/src/Speedo/spfuncs.c +++ b/src/Speedo/spfuncs.c @@ -54,8 +54,8 @@ from The Open Group. #ifndef FONTMODULE #include #endif -#include "fntfilst.h" -#include "fontutil.h" +#include +#include #include "spint.h" /* ARGSUSED */ diff --git a/src/Speedo/spglyph.c b/src/Speedo/spglyph.c index 979a472..dbf47b9 100644 --- a/src/Speedo/spglyph.c +++ b/src/Speedo/spglyph.c @@ -53,7 +53,7 @@ from The Open Group. #include /* for bit order #defines */ #include "spint.h" -#include "fontutil.h" +#include #undef CLIP_BBOX_NOISE diff --git a/src/Speedo/spinfo.c b/src/Speedo/spinfo.c index d7c9c0e..054b46e 100644 --- a/src/Speedo/spinfo.c +++ b/src/Speedo/spinfo.c @@ -51,8 +51,8 @@ from The Open Group. */ /* $XFree86: xc/lib/font/Speedo/spinfo.c,v 1.12 2001/12/14 19:56:42 dawes Exp $ */ -#include "fntfilst.h" -#include "fontutil.h" +#include +#include #include "spint.h" #ifndef FONTMODULE #include diff --git a/src/Speedo/spint.h b/src/Speedo/spint.h index 18e5203..118ea8f 100644 --- a/src/Speedo/spint.h +++ b/src/Speedo/spint.h @@ -52,7 +52,7 @@ from The Open Group. #ifndef _SPINT_H_ #define _SPINT_H_ -#include "fntfilst.h" +#include #ifndef XFree86LOADER #include #else diff --git a/src/Type1/afm.c b/src/Type1/afm.c index 7df8eba..c930ae7 100644 --- a/src/Type1/afm.c +++ b/src/Type1/afm.c @@ -27,7 +27,7 @@ #include "Xdefs.h" /* For Bool */ #include "xf86_ansic.h" #endif -#include "fontmisc.h" /* for xalloc/xfree */ +#include /* for xalloc/xfree */ #include "AFM.h" #define PBUF 256 diff --git a/src/Type1/cidchar.c b/src/Type1/cidchar.c index 6699318..fad8801 100644 --- a/src/Type1/cidchar.c +++ b/src/Type1/cidchar.c @@ -42,7 +42,7 @@ #undef _XOPEN_SOURCE #endif #endif -#include "fntfilst.h" +#include #include "objects.h" #include "spaces.h" #include "range.h" diff --git a/src/Type1/fontfcn.c b/src/Type1/fontfcn.c index 45078d7..081d81b 100644 --- a/src/Type1/fontfcn.c +++ b/src/Type1/fontfcn.c @@ -61,7 +61,7 @@ #include "range.h" #include "Xdefs.h" #endif -#include "fntfilst.h" +#include #include "fontfcn.h" extern struct segment *Type1Char ( char *env, XYspace S, diff --git a/src/Type1/scanfont.c b/src/Type1/scanfont.c index 64f7473..1ccef28 100644 --- a/src/Type1/scanfont.c +++ b/src/Type1/scanfont.c @@ -1,4 +1,4 @@ -/* $XdotOrg: scanfont.c,v 1.3 2000/08/17 19:46:32 cpqbld Exp $ */ +/* $XdotOrg: xc/lib/font/Type1/scanfont.c,v 1.2 2004/04/23 18:44:09 eich Exp $ */ /* $Xorg: scanfont.c,v 1.3 2000/08/17 19:46:32 cpqbld Exp $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved diff --git a/src/Type1/t1funcs.c b/src/Type1/t1funcs.c index 64ff16e..cae0e04 100644 --- a/src/Type1/t1funcs.c +++ b/src/Type1/t1funcs.c @@ -130,8 +130,8 @@ from The Open Group. #include "xf86_ansic.h" #endif -#include "fntfilst.h" -#include "fontutil.h" +#include +#include #include #include #include "t1unicode.h" diff --git a/src/Type1/t1info.c b/src/Type1/t1info.c index aa00aca..50862b8 100644 --- a/src/Type1/t1info.c +++ b/src/Type1/t1info.c @@ -101,8 +101,8 @@ from The Open Group. */ /* $XFree86: xc/lib/font/Type1/t1info.c,v 1.18tsi Exp $ */ -#include "fntfilst.h" -#include "fontutil.h" +#include +#include #ifndef FONTMODULE #include #ifndef BUILDCID diff --git a/src/Type1/util.c b/src/Type1/util.c index 74d53fc..a2eaafd 100644 --- a/src/Type1/util.c +++ b/src/Type1/util.c @@ -55,7 +55,7 @@ #include "xf86_ansic.h" #endif #include "util.h" -#include "fontmisc.h" /* for xalloc/xfree */ +#include /* for xalloc/xfree */ static char *vm_base = NULL; /* Start of virtual memory area */ char *vm_next = NULL; /* Pointer to first free byte */ diff --git a/src/bitmap/bdfread.c b/src/bitmap/bdfread.c index 1bcf3cb..37d54a2 100644 --- a/src/bitmap/bdfread.c +++ b/src/bitmap/bdfread.c @@ -55,10 +55,10 @@ from The Open Group. #ifndef FONTMODULE #include #endif -#include "fntfilst.h" -#include "fontutil.h" +#include +#include /* use bitmap structure */ -#include "bitmap.h" +#include #include "bdfint.h" #define INDICES 256 diff --git a/src/bitmap/bdfutils.c b/src/bitmap/bdfutils.c index af3e4e6..3128eab 100644 --- a/src/bitmap/bdfutils.c +++ b/src/bitmap/bdfutils.c @@ -57,10 +57,10 @@ from The Open Group. #include #endif -#include "fntfilst.h" +#include #include /* use bitmap structure */ -#include "bitmap.h" +#include #include "bdfint.h" int bdfFileLineNum; diff --git a/src/bitmap/bitmap.c b/src/bitmap/bitmap.c index 8c37f69..eb6caf2 100644 --- a/src/bitmap/bitmap.c +++ b/src/bitmap/bitmap.c @@ -31,8 +31,8 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -#include "fntfilst.h" -#include "bitmap.h" +#include +#include int bitmapGetGlyphs(FontPtr pFont, unsigned long count, unsigned char *chars, diff --git a/src/bitmap/bitmapfunc.c b/src/bitmap/bitmapfunc.c index 4312e88..28028f9 100644 --- a/src/bitmap/bitmapfunc.c +++ b/src/bitmap/bitmapfunc.c @@ -32,9 +32,9 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -#include "fntfilst.h" -#include "bitmap.h" -#include "fontutil.h" +#include +#include +#include #include "bdfint.h" #include "pcf.h" #include "snfstr.h" diff --git a/src/bitmap/bitmaputil.c b/src/bitmap/bitmaputil.c index 76643b8..79093ab 100644 --- a/src/bitmap/bitmaputil.c +++ b/src/bitmap/bitmaputil.c @@ -29,8 +29,8 @@ from The Open Group. */ /* $XFree86: xc/lib/font/bitmap/bitmaputil.c,v 1.10 2002/09/24 20:52:48 tsi Exp $ */ -#include "fntfilst.h" -#include "bitmap.h" +#include +#include #include "bdfint.h" #ifndef MAXSHORT diff --git a/src/bitmap/bitscale.c b/src/bitmap/bitscale.c index 1af9f4f..e03da0c 100644 --- a/src/bitmap/bitscale.c +++ b/src/bitmap/bitscale.c @@ -32,9 +32,9 @@ from The Open Group. * Author: Keith Packard, MIT X Consortium */ -#include "fntfilst.h" -#include "bitmap.h" -#include "fontutil.h" +#include +#include +#include #ifndef FONTMODULE #ifdef _XOPEN_SOURCE #include diff --git a/src/bitmap/fontink.c b/src/bitmap/fontink.c index c3f5e8c..cc70cd7 100644 --- a/src/bitmap/fontink.c +++ b/src/bitmap/fontink.c @@ -33,8 +33,8 @@ from The Open Group. * Author: Keith Packard, MIT X Consortium */ -#include "fntfilst.h" -#include "bitmap.h" +#include +#include #include "bdfint.h" static unsigned char ink_mask_msb[8] = { diff --git a/src/bitmap/pcfread.c b/src/bitmap/pcfread.c index 0b4b6c7..d8d75f6 100644 --- a/src/bitmap/pcfread.c +++ b/src/bitmap/pcfread.c @@ -32,8 +32,8 @@ from The Open Group. * Author: Keith Packard, MIT X Consortium */ -#include "fntfilst.h" -#include "bitmap.h" +#include +#include #include "pcf.h" #ifndef MAX diff --git a/src/bitmap/pcfwrite.c b/src/bitmap/pcfwrite.c index a55369f..03742f5 100644 --- a/src/bitmap/pcfwrite.c +++ b/src/bitmap/pcfwrite.c @@ -33,8 +33,8 @@ from The Open Group. */ -#include "fntfilst.h" -#include "bitmap.h" +#include +#include #include "pcf.h" /* Write PCF font files */ diff --git a/src/bitmap/snfread.c b/src/bitmap/snfread.c index e40f392..c8bbee0 100644 --- a/src/bitmap/snfread.c +++ b/src/bitmap/snfread.c @@ -55,8 +55,8 @@ from The Open Group. #include #endif -#include "fntfilst.h" -#include "bitmap.h" +#include +#include #include "snfstr.h" #include diff --git a/src/bitmap/snfstr.h b/src/bitmap/snfstr.h index 1043d50..8158089 100644 --- a/src/bitmap/snfstr.h +++ b/src/bitmap/snfstr.h @@ -54,7 +54,7 @@ from The Open Group. #ifndef SNFSTR_H #define SNFSTR_H 1 -#include "fntfilio.h" +#include /*- * This file describes the Server Natural Font format. diff --git a/src/builtins/builtin.h b/src/builtins/builtin.h index 5ee94a6..ea98407 100644 --- a/src/builtins/builtin.h +++ b/src/builtins/builtin.h @@ -26,10 +26,10 @@ #include #include -#include "fontxlfd.h" -#include "fntfil.h" -#include "fntfilio.h" -#include "fntfilst.h" +#include +#include +#include +#include typedef struct _BuiltinFile { const char *name; diff --git a/src/builtins/fpe.c b/src/builtins/fpe.c index 219d998..b5c67ce 100644 --- a/src/builtins/fpe.c +++ b/src/builtins/fpe.c @@ -24,7 +24,7 @@ */ /* $XFree86: xc/lib/font/builtins/fpe.c,v 1.3 1999/12/30 02:29:51 robin Exp $ */ -#include "fntfilst.h" +#include static int font_file_type; diff --git a/src/builtins/render.c b/src/builtins/render.c index 7e7180e..8f8536a 100644 --- a/src/builtins/render.c +++ b/src/builtins/render.c @@ -24,7 +24,7 @@ */ /* $XFree86: xc/lib/font/builtins/render.c,v 1.3 1999/12/30 02:29:51 robin Exp $ */ -#include "fntfilst.h" +#include #include "builtin.h" BuiltinOpenBitmap (fpe, ppFont, flags, entry, fileName, format, fmask) diff --git a/src/fc/fsconvert.c b/src/fc/fsconvert.c index 3920325..ea2b45b 100644 --- a/src/fc/fsconvert.c +++ b/src/fc/fsconvert.c @@ -32,10 +32,10 @@ #include #include #include -#include "fontmisc.h" +#include #include #include "fservestr.h" -#include "fontutil.h" +#include #include "fslibos.h" extern char _fs_glyph_undefined; diff --git a/src/fc/fserve.c b/src/fc/fserve.c index ec66266..96698a0 100644 --- a/src/fc/fserve.c +++ b/src/fc/fserve.c @@ -64,10 +64,10 @@ in this Software without prior written authorization from The Open Group. #include #include #include -#include "fontmisc.h" +#include #include #include "fservestr.h" -#include "fontutil.h" +#include #include #include diff --git a/src/fc/fsio.c b/src/fc/fsio.c index 9d5d7b4..f788f9c 100644 --- a/src/fc/fsio.c +++ b/src/fc/fsio.c @@ -39,7 +39,7 @@ #include "X11/Xpoll.h" #include #include -#include "fontmisc.h" +#include #include #include "fservestr.h" diff --git a/src/fontcache/fontcache.h b/src/fontcache/fontcache.h index da1fe83..c95de25 100644 --- a/src/fontcache/fontcache.h +++ b/src/fontcache/fontcache.h @@ -31,7 +31,7 @@ #ifndef _FONTCACHE_H_ #define _FONTCACHE_H_ -#include "fontmisc.h" +#include #include #include "fcqueue.h" #define _FONTCACHE_SERVER_ diff --git a/src/fontfile/bitsource.c b/src/fontfile/bitsource.c index b487ce4..2039fe7 100644 --- a/src/fontfile/bitsource.c +++ b/src/fontfile/bitsource.c @@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -#include "fntfilst.h" +#include BitmapSourcesRec FontFileBitmapSources; diff --git a/src/fontfile/bufio.c b/src/fontfile/bufio.c index aa2a7a5..a6b20e7 100644 --- a/src/fontfile/bufio.c +++ b/src/fontfile/bufio.c @@ -35,8 +35,8 @@ from The Open Group. #include -#include -#include +#include +#include #include BufFilePtr diff --git a/src/fontfile/decompress.c b/src/fontfile/decompress.c index d35f5a6..ca552a1 100644 --- a/src/fontfile/decompress.c +++ b/src/fontfile/decompress.c @@ -50,8 +50,8 @@ in this Software without prior written authorization from The Open Group. * decompress - cat a compressed file */ -#include "fontmisc.h" -#include +#include +#include #define BITS 16 diff --git a/src/fontfile/defaults.c b/src/fontfile/defaults.c index 41b958e..0091571 100644 --- a/src/fontfile/defaults.c +++ b/src/fontfile/defaults.c @@ -62,7 +62,7 @@ in this Software without prior written authorization from The Open Group. #define DEFAULT_SCAN_UNIT 1 #endif -#include "fntfilst.h" +#include void FontDefaultFormat (int *bit, int *byte, int *glyph, int *scan) diff --git a/src/fontfile/dirfile.c b/src/fontfile/dirfile.c index e4b42dc..67b1f96 100644 --- a/src/fontfile/dirfile.c +++ b/src/fontfile/dirfile.c @@ -37,7 +37,7 @@ in this Software without prior written authorization from The Open Group. * Read fonts.dir and fonts.alias files */ -#include "fntfilst.h" +#include #include #include #include diff --git a/src/fontfile/ffcheck.c b/src/fontfile/ffcheck.c index d564f6c..2c2f7ea 100644 --- a/src/fontfile/ffcheck.c +++ b/src/fontfile/ffcheck.c @@ -32,10 +32,10 @@ in this Software without prior written authorization from The Open Group. */ /* $NCDXorg: @(#)fontfile.c,v 1.6 1991/07/02 17:00:46 lemke Exp $ */ -#include "fntfilst.h" -#include "bitmap.h" +#include +#include #ifdef LOADABLEFONTS -#include "fontmod.h" +#include #endif /* diff --git a/src/fontfile/fileio.c b/src/fontfile/fileio.c index cdcc853..61151d5 100644 --- a/src/fontfile/fileio.c +++ b/src/fontfile/fileio.c @@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -#include +#include #include #ifndef O_BINARY #define O_BINARY O_RDONLY diff --git a/src/fontfile/filewr.c b/src/fontfile/filewr.c index 5deb1a5..7feafe7 100644 --- a/src/fontfile/filewr.c +++ b/src/fontfile/filewr.c @@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -#include +#include #include FontFilePtr diff --git a/src/fontfile/fontdir.c b/src/fontfile/fontdir.c index 455c6c4..c20cda6 100644 --- a/src/fontfile/fontdir.c +++ b/src/fontfile/fontdir.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/lib/font/fontfile/fontdir.c,v 1.2 2004/04/23 18:44:21 eich Exp $ */ +/* $XdotOrg: xc/lib/font/fontfile/fontdir.c,v 1.3 2004/11/15 15:06:55 ago Exp $ */ /* $Xorg: fontdir.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */ /* @@ -32,7 +32,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -#include "fntfilst.h" +#include #include Bool diff --git a/src/fontfile/fontencc.c b/src/fontfile/fontencc.c index 3e02582..f88ffcb 100644 --- a/src/fontfile/fontencc.c +++ b/src/fontfile/fontencc.c @@ -29,7 +29,7 @@ THE SOFTWARE. now have different names. */ #include -#include "fontencc.h" +#include extern void ErrorF(const char *f, ...); diff --git a/src/fontfile/fontfile.c b/src/fontfile/fontfile.c index 82c6fd9..33586a4 100644 --- a/src/fontfile/fontfile.c +++ b/src/fontfile/fontfile.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/lib/font/fontfile/fontfile.c,v 1.2 2004/04/23 18:44:21 eich Exp $ */ +/* $XdotOrg: xc/lib/font/fontfile/fontfile.c,v 1.3 2004/11/15 15:06:56 ago Exp $ */ /* $Xorg: fontfile.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */ /* @@ -33,7 +33,7 @@ in this Software without prior written authorization from The Open Group. */ /* $NCDXorg: @(#)fontfile.c,v 1.6 1991/07/02 17:00:46 lemke Exp $ */ -#include "fntfilst.h" +#include #ifdef WIN32 #include #endif diff --git a/src/fontfile/fontscale.c b/src/fontfile/fontscale.c index 3b7443f..f9c6323 100644 --- a/src/fontfile/fontscale.c +++ b/src/fontfile/fontscale.c @@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -#include "fntfilst.h" +#include #ifdef _XOPEN_SOURCE #include #else diff --git a/src/fontfile/gunzip.c b/src/fontfile/gunzip.c index bf737a8..9669a8b 100644 --- a/src/fontfile/gunzip.c +++ b/src/fontfile/gunzip.c @@ -4,8 +4,8 @@ intended for inclusion in X11 public releases. */ /* $XFree86: xc/lib/font/fontfile/gunzip.c,v 1.4 2000/09/19 12:46:08 eich Exp $ */ -#include "fontmisc.h" -#include +#include +#include #include typedef struct _xzip_buf { diff --git a/src/fontfile/printerfont.c b/src/fontfile/printerfont.c index d241d1b..f91052d 100644 --- a/src/fontfile/printerfont.c +++ b/src/fontfile/printerfont.c @@ -32,7 +32,7 @@ in this Software without prior written authorization from The Open Group. */ /* $NCDXorg: @(#)fontfile.c,v 1.6 1991/07/02 17:00:46 lemke Exp $ */ -#include "fntfilst.h" +#include /* * Map FPE functions to renderer functions diff --git a/src/fontfile/register.c b/src/fontfile/register.c index f168d53..eaacdc1 100644 --- a/src/fontfile/register.c +++ b/src/fontfile/register.c @@ -33,12 +33,12 @@ in this Software without prior written authorization from The Open Group. * end up dragging in code from all the renderers, which is not small. */ -#include "fontmisc.h" -#include "fntfilst.h" -#include "bitmap.h" +#include +#include +#include #ifdef LOADABLEFONTS -#include "fontmod.h" +#include #endif void diff --git a/src/fontfile/renderers.c b/src/fontfile/renderers.c index 7d11d3e..4186724 100644 --- a/src/fontfile/renderers.c +++ b/src/fontfile/renderers.c @@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -#include "fntfilst.h" +#include extern void ErrorF(const char *f, ...); static FontRenderersRec renderers; diff --git a/src/stubs/stubs.h b/src/stubs/stubs.h index 38f77fc..d687a77 100644 --- a/src/stubs/stubs.h +++ b/src/stubs/stubs.h @@ -3,7 +3,7 @@ /* This directory includes dummy entry for bdftopcf and mkfontdir */ #include -#include "fntfilst.h" +#include #include diff --git a/src/util/atom.c b/src/util/atom.c index 36a2f44..8c7d17f 100644 --- a/src/util/atom.c +++ b/src/util/atom.c @@ -33,7 +33,7 @@ in this Software without prior written authorization from The Open Group. /* lame atom replacement routines for font applications */ -#include "fontmisc.h" +#include typedef struct _AtomList { char *name; diff --git a/src/util/fontaccel.c b/src/util/fontaccel.c index 241bee1..28d6866 100644 --- a/src/util/fontaccel.c +++ b/src/util/fontaccel.c @@ -33,9 +33,9 @@ from The Open Group. * Author: Keith Packard, MIT X Consortium */ -#include "fontmisc.h" +#include #include -#include "fontutil.h" +#include void FontComputeInfoAccelerators(FontInfoPtr pFontInfo) diff --git a/src/util/fontnames.c b/src/util/fontnames.c index ee2985c..6be292e 100644 --- a/src/util/fontnames.c +++ b/src/util/fontnames.c @@ -35,7 +35,7 @@ from The Open Group. * @(#)fontnames.c 3.1 91/04/10 */ -#include "fontmisc.h" +#include #include void diff --git a/src/util/fontutil.c b/src/util/fontutil.c index d2dfd91..8440b35 100644 --- a/src/util/fontutil.c +++ b/src/util/fontutil.c @@ -33,10 +33,10 @@ from The Open Group. * Author: Keith Packard, MIT X Consortium */ -#include "fontmisc.h" +#include #include #include -#include "fontutil.h" +#include /* Define global here... doesn't hurt the servers, and avoids unresolved references in font clients. */ diff --git a/src/util/fontxlfd.c b/src/util/fontxlfd.c index 3b0ce6b..9ea1ffc 100644 --- a/src/util/fontxlfd.c +++ b/src/util/fontxlfd.c @@ -33,10 +33,10 @@ from The Open Group. * Author: Keith Packard, MIT X Consortium */ -#include "fontmisc.h" +#include #include -#include "fontxlfd.h" -#include "fontutil.h" +#include +#include #include #include #include diff --git a/src/util/format.c b/src/util/format.c index cdd5b5e..89faae8 100644 --- a/src/util/format.c +++ b/src/util/format.c @@ -55,7 +55,7 @@ from The Open Group. #include #include #include -#include "fontutil.h" +#include int CheckFSFormat(fsBitmapFormat format, diff --git a/src/util/miscutil.c b/src/util/miscutil.c index 2d4e973..0ee0c3f 100644 --- a/src/util/miscutil.c +++ b/src/util/miscutil.c @@ -31,7 +31,7 @@ from The Open Group. #include #include -#include "fontmisc.h" +#include #define XK_LATIN1 #include diff --git a/src/util/patcache.c b/src/util/patcache.c index e62af6d..cc81954 100644 --- a/src/util/patcache.c +++ b/src/util/patcache.c @@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -#include +#include #include /* diff --git a/src/util/private.c b/src/util/private.c index 8e83c74..19d30c4 100644 --- a/src/util/private.c +++ b/src/util/private.c @@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -#include "fontmisc.h" +#include #include static int _FontPrivateAllocateIndex = 0; diff --git a/src/util/utilbitmap.c b/src/util/utilbitmap.c index 133ad39..a6df83f 100644 --- a/src/util/utilbitmap.c +++ b/src/util/utilbitmap.c @@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -#include "fontmisc.h" +#include /* Utility functions for reformating font bitmaps */ -- cgit v1.2.3