From 175bbc2e58f7dbe5c1f097ef36eadc3f6fe4b5e6 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Fri, 27 May 2005 17:44:08 +0000 Subject: Reference X11/fonts header files using X11/fonts/ prefix. --- include/X11/fonts/fntfilst.h | 2 +- include/X11/fonts/fontutil.h | 2 +- include/X11/fonts/fontxlfd.h | 2 +- src/FreeType/ftenc.c | 2 +- src/FreeType/ftfuncs.c | 2 +- src/FreeType/fttools.c | 2 +- src/bitmap/bdfutils.c | 2 +- src/builtins/builtin.h | 2 +- src/fc/fsconvert.c | 6 +++--- src/fc/fserve.c | 6 +++--- src/fc/fsio.c | 6 +++--- src/fontcache/fontcache.h | 2 +- src/stubs/stubs.h | 2 +- src/util/fontaccel.c | 2 +- src/util/fontnames.c | 2 +- src/util/fontutil.c | 4 ++-- src/util/fontxlfd.c | 2 +- src/util/format.c | 6 +++--- src/util/patcache.c | 2 +- src/util/private.c | 2 +- 20 files changed, 29 insertions(+), 29 deletions(-) diff --git a/include/X11/fonts/fntfilst.h b/include/X11/fonts/fntfilst.h index c037267..cfe555a 100644 --- a/include/X11/fonts/fntfilst.h +++ b/include/X11/fonts/fntfilst.h @@ -40,7 +40,7 @@ in this Software without prior written authorization from The Open Group. #ifndef XP_PSTEXT #include "fontmisc.h" #endif -#include "fontstruct.h" +#include #include "fontxlfd.h" #include "fntfil.h" diff --git a/include/X11/fonts/fontutil.h b/include/X11/fonts/fontutil.h index daa8815..9a73eaa 100644 --- a/include/X11/fonts/fontutil.h +++ b/include/X11/fonts/fontutil.h @@ -3,7 +3,7 @@ #ifndef _FONTUTIL_H_ #define _FONTUTIL_H_ -#include "FSproto.h" +#include extern int FontCouldBeTerminal(FontInfoPtr); extern int CheckFSFormat(fsBitmapFormat, fsBitmapFormatMask, int *, int *, diff --git a/include/X11/fonts/fontxlfd.h b/include/X11/fonts/fontxlfd.h index e9a12d2..e87b931 100644 --- a/include/X11/fonts/fontxlfd.h +++ b/include/X11/fonts/fontxlfd.h @@ -36,7 +36,7 @@ from The Open Group. #ifndef _FONTXLFD_H_ #define _FONTXLFD_H_ -#include "FSproto.h" +#include /* Constants for values_supplied bitmap */ diff --git a/src/FreeType/ftenc.c b/src/FreeType/ftenc.c index d45dc32..1f75d80 100644 --- a/src/FreeType/ftenc.c +++ b/src/FreeType/ftenc.c @@ -31,7 +31,7 @@ THE SOFTWARE. #include "fntfilst.h" #include "fontutil.h" -#include "FSproto.h" +#include #include "fontmisc.h" #include "fontenc.h" diff --git a/src/FreeType/ftfuncs.c b/src/FreeType/ftfuncs.c index 0cfd7ea..6cdff76 100644 --- a/src/FreeType/ftfuncs.c +++ b/src/FreeType/ftfuncs.c @@ -42,7 +42,7 @@ THE SOFTWARE. #include "fntfilst.h" #include "fontutil.h" -#include "FSproto.h" +#include #include #include FT_FREETYPE_H #include FT_SIZES_H diff --git a/src/FreeType/fttools.c b/src/FreeType/fttools.c index 1567724..b604771 100644 --- a/src/FreeType/fttools.c +++ b/src/FreeType/fttools.c @@ -33,7 +33,7 @@ #include "xf86_ansic.h" #endif -#include "font.h" +#include #include #include FT_FREETYPE_H #include FT_SFNT_NAMES_H diff --git a/src/bitmap/bdfutils.c b/src/bitmap/bdfutils.c index a2641ef..af3e4e6 100644 --- a/src/bitmap/bdfutils.c +++ b/src/bitmap/bdfutils.c @@ -58,7 +58,7 @@ from The Open Group. #endif #include "fntfilst.h" -#include "fontstruct.h" +#include /* use bitmap structure */ #include "bitmap.h" #include "bdfint.h" diff --git a/src/builtins/builtin.h b/src/builtins/builtin.h index f29a82c..5ee94a6 100644 --- a/src/builtins/builtin.h +++ b/src/builtins/builtin.h @@ -25,7 +25,7 @@ /* $XFree86: xc/lib/font/builtins/builtin.h,v 1.3 1999/12/30 02:29:49 robin Exp $ */ #include -#include +#include #include "fontxlfd.h" #include "fntfil.h" #include "fntfilio.h" diff --git a/src/fc/fsconvert.c b/src/fc/fsconvert.c index 84ad901..ea639db 100644 --- a/src/fc/fsconvert.c +++ b/src/fc/fsconvert.c @@ -30,10 +30,10 @@ #include #include #include -#include "FS.h" -#include "FSproto.h" +#include +#include #include "fontmisc.h" -#include "fontstruct.h" +#include #include "fservestr.h" #include "fontutil.h" #include "fslibos.h" diff --git a/src/fc/fserve.c b/src/fc/fserve.c index 85a4214..ad1cf6b 100644 --- a/src/fc/fserve.c +++ b/src/fc/fserve.c @@ -58,12 +58,12 @@ in this Software without prior written authorization from The Open Group. #endif #include "X11/Xtrans.h" #include "X11/Xpoll.h" -#include "FS.h" -#include "FSproto.h" +#include +#include #include #include #include "fontmisc.h" -#include "fontstruct.h" +#include #include "fservestr.h" #include "fontutil.h" #include diff --git a/src/fc/fsio.c b/src/fc/fsio.c index 2c37849..8e0b606 100644 --- a/src/fc/fsio.c +++ b/src/fc/fsio.c @@ -35,10 +35,10 @@ #include "X11/Xtrans.h" #include "X11/Xpoll.h" -#include "FS.h" -#include "FSproto.h" +#include +#include #include "fontmisc.h" -#include "fontstruct.h" +#include #include "fservestr.h" #include diff --git a/src/fontcache/fontcache.h b/src/fontcache/fontcache.h index 713b314..da1fe83 100644 --- a/src/fontcache/fontcache.h +++ b/src/fontcache/fontcache.h @@ -32,7 +32,7 @@ #define _FONTCACHE_H_ #include "fontmisc.h" -#include "fontstruct.h" +#include #include "fcqueue.h" #define _FONTCACHE_SERVER_ #include diff --git a/src/stubs/stubs.h b/src/stubs/stubs.h index fe8ddd1..38f77fc 100644 --- a/src/stubs/stubs.h +++ b/src/stubs/stubs.h @@ -4,7 +4,7 @@ #include #include "fntfilst.h" -#include "font.h" +#include #ifndef True diff --git a/src/util/fontaccel.c b/src/util/fontaccel.c index 3dd2492..241bee1 100644 --- a/src/util/fontaccel.c +++ b/src/util/fontaccel.c @@ -34,7 +34,7 @@ from The Open Group. */ #include "fontmisc.h" -#include "fontstruct.h" +#include #include "fontutil.h" void diff --git a/src/util/fontnames.c b/src/util/fontnames.c index 130589f..ee2985c 100644 --- a/src/util/fontnames.c +++ b/src/util/fontnames.c @@ -36,7 +36,7 @@ from The Open Group. */ #include "fontmisc.h" -#include "fontstruct.h" +#include void FreeFontNames(FontNamesPtr pFN) diff --git a/src/util/fontutil.c b/src/util/fontutil.c index daf65e4..d2dfd91 100644 --- a/src/util/fontutil.c +++ b/src/util/fontutil.c @@ -34,8 +34,8 @@ from The Open Group. */ #include "fontmisc.h" -#include "fontstruct.h" -#include "FSproto.h" +#include +#include #include "fontutil.h" /* Define global here... doesn't hurt the servers, and avoids diff --git a/src/util/fontxlfd.c b/src/util/fontxlfd.c index ac7c8ca..3b0ce6b 100644 --- a/src/util/fontxlfd.c +++ b/src/util/fontxlfd.c @@ -34,7 +34,7 @@ from The Open Group. */ #include "fontmisc.h" -#include "fontstruct.h" +#include #include "fontxlfd.h" #include "fontutil.h" #include diff --git a/src/util/format.c b/src/util/format.c index 596e6eb..cdd5b5e 100644 --- a/src/util/format.c +++ b/src/util/format.c @@ -52,9 +52,9 @@ from The Open Group. */ /* $XFree86: xc/lib/font/util/format.c,v 1.4 2001/01/17 19:43:33 dawes Exp $ */ -#include "FSproto.h" -#include "font.h" -#include "fontstruct.h" +#include +#include +#include #include "fontutil.h" int diff --git a/src/util/patcache.c b/src/util/patcache.c index 37d0281..e62af6d 100644 --- a/src/util/patcache.c +++ b/src/util/patcache.c @@ -32,7 +32,7 @@ in this Software without prior written authorization from The Open Group. */ #include -#include +#include /* * Static sized hash table for looking up font name patterns diff --git a/src/util/private.c b/src/util/private.c index d902484..8e83c74 100644 --- a/src/util/private.c +++ b/src/util/private.c @@ -32,7 +32,7 @@ in this Software without prior written authorization from The Open Group. */ #include "fontmisc.h" -#include "fontstruct.h" +#include static int _FontPrivateAllocateIndex = 0; -- cgit v1.2.3