summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2005-07-03 07:01:01 +0000
committerDaniel Stone <daniel@fooishbar.org>2005-07-03 07:01:01 +0000
commit932edb23b47440397447265bf72ad7932fd80070 (patch)
tree16cda22a6b6b9e9a8ca05a9946dc66f4edf34293
parentb03d67fd1612a0df5132b10dd0bd9b2cec053a39 (diff)
Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings. Add #include <dix-config.h> or <xorg-config.h>, 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 <X11/fonts/foo.h>.
-rw-r--r--include/X11/fonts/bitmap.h2
-rw-r--r--include/X11/fonts/fntfil.h2
-rw-r--r--include/X11/fonts/fntfilio.h2
-rw-r--r--include/X11/fonts/fntfilst.h6
-rw-r--r--src/FreeType/ftenc.c8
-rw-r--r--src/FreeType/ftfuncs.c10
-rw-r--r--src/FreeType/fttools.c2
-rw-r--r--src/FreeType/xttcap.c2
-rw-r--r--src/Speedo/spfile.c4
-rw-r--r--src/Speedo/spfont.c2
-rw-r--r--src/Speedo/spfuncs.c4
-rw-r--r--src/Speedo/spglyph.c2
-rw-r--r--src/Speedo/spinfo.c4
-rw-r--r--src/Speedo/spint.h2
-rw-r--r--src/Type1/afm.c2
-rw-r--r--src/Type1/cidchar.c2
-rw-r--r--src/Type1/fontfcn.c2
-rw-r--r--src/Type1/scanfont.c2
-rw-r--r--src/Type1/t1funcs.c4
-rw-r--r--src/Type1/t1info.c4
-rw-r--r--src/Type1/util.c2
-rw-r--r--src/bitmap/bdfread.c6
-rw-r--r--src/bitmap/bdfutils.c4
-rw-r--r--src/bitmap/bitmap.c4
-rw-r--r--src/bitmap/bitmapfunc.c6
-rw-r--r--src/bitmap/bitmaputil.c4
-rw-r--r--src/bitmap/bitscale.c6
-rw-r--r--src/bitmap/fontink.c4
-rw-r--r--src/bitmap/pcfread.c4
-rw-r--r--src/bitmap/pcfwrite.c4
-rw-r--r--src/bitmap/snfread.c4
-rw-r--r--src/bitmap/snfstr.h2
-rw-r--r--src/builtins/builtin.h8
-rw-r--r--src/builtins/fpe.c2
-rw-r--r--src/builtins/render.c2
-rw-r--r--src/fc/fsconvert.c4
-rw-r--r--src/fc/fserve.c4
-rw-r--r--src/fc/fsio.c2
-rw-r--r--src/fontcache/fontcache.h2
-rw-r--r--src/fontfile/bitsource.c2
-rw-r--r--src/fontfile/bufio.c4
-rw-r--r--src/fontfile/decompress.c4
-rw-r--r--src/fontfile/defaults.c2
-rw-r--r--src/fontfile/dirfile.c2
-rw-r--r--src/fontfile/ffcheck.c6
-rw-r--r--src/fontfile/fileio.c2
-rw-r--r--src/fontfile/filewr.c2
-rw-r--r--src/fontfile/fontdir.c4
-rw-r--r--src/fontfile/fontencc.c2
-rw-r--r--src/fontfile/fontfile.c4
-rw-r--r--src/fontfile/fontscale.c2
-rw-r--r--src/fontfile/gunzip.c4
-rw-r--r--src/fontfile/printerfont.c2
-rw-r--r--src/fontfile/register.c8
-rw-r--r--src/fontfile/renderers.c2
-rw-r--r--src/stubs/stubs.h2
-rw-r--r--src/util/atom.c2
-rw-r--r--src/util/fontaccel.c4
-rw-r--r--src/util/fontnames.c2
-rw-r--r--src/util/fontutil.c4
-rw-r--r--src/util/fontxlfd.c6
-rw-r--r--src/util/format.c2
-rw-r--r--src/util/miscutil.c2
-rw-r--r--src/util/patcache.c2
-rw-r--r--src/util/private.c2
-rw-r--r--src/util/utilbitmap.c2
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 <X11/fonts/fntfilio.h>
#ifndef FONTMODULE
#include <stdio.h> /* 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 <X11/fonts/fontxlfd.h>
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 <X11/fonts/bufio.h>
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 <X11/Xos.h>
#endif
#ifndef XP_PSTEXT
-#include "fontmisc.h"
+#include <X11/fonts/fontmisc.h>
#endif
#include <X11/fonts/fontstruct.h>
-#include "fontxlfd.h"
-#include "fntfil.h"
+#include <X11/fonts/fontxlfd.h>
+#include <X11/fonts/fntfil.h>
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 <X11/fonts/fntfilst.h>
+#include <X11/fonts/fontutil.h>
#include <X11/fonts/FSproto.h>
-#include "fontmisc.h"
-#include "fontenc.h"
+#include <X11/fonts/fontmisc.h>
+#include <X11/fonts/fontenc.h>
#include <ft2build.h>
#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 <X11/fonts/fontmisc.h>
#ifndef FONTMODULE
#include <string.h>
@@ -40,8 +40,8 @@ THE SOFTWARE.
#include "xf86_ansic.h"
#endif
-#include "fntfilst.h"
-#include "fontutil.h"
+#include <X11/fonts/fntfilst.h>
+#include <X11/fonts/fontutil.h>
#include <X11/fonts/FSproto.h>
#include <ft2build.h>
#include FT_FREETYPE_H
@@ -64,7 +64,7 @@ THE SOFTWARE.
#include FT_OUTLINE_H
#endif
-#include "fontenc.h"
+#include <X11/fonts/fontenc.h>
#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 <X11/fonts/fontmisc.h>
#ifndef FONTMODULE
#include <ctype.h>
#include <string.h>
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 <X11/fonts/fontmisc.h>
#ifndef FONTMODULE
#include <string.h>
#include <ctype.h>
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 <X11/fonts/fntfilst.h>
+#include <X11/fonts/fontenc.h>
#ifndef FONTMODULE
#include <stdio.h>
#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 <X11/fonts/FSproto.h>
#include "spint.h"
-#include "fontutil.h"
+#include <X11/fonts/fontutil.h>
#ifndef FONTMODULE
#ifdef _XOPEN_SOURCE
#include <math.h>
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 <X11/Xos.h>
#endif
-#include "fntfilst.h"
-#include "fontutil.h"
+#include <X11/fonts/fntfilst.h>
+#include <X11/fonts/fontutil.h>
#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 <X11/X.h> /* for bit order #defines */
#include "spint.h"
-#include "fontutil.h"
+#include <X11/fonts/fontutil.h>
#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 <X11/fonts/fntfilst.h>
+#include <X11/fonts/fontutil.h>
#include "spint.h"
#ifndef FONTMODULE
#include <math.h>
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 <X11/fonts/fntfilst.h>
#ifndef XFree86LOADER
#include <stdio.h>
#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 <X11/fonts/fontmisc.h> /* 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 <X11/fonts/fntfilst.h>
#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 <X11/fonts/fntfilst.h>
#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 <X11/fonts/fntfilst.h>
+#include <X11/fonts/fontutil.h>
#include <X11/fonts/FSproto.h>
#include <X11/fonts/fontenc.h>
#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 <X11/fonts/fntfilst.h>
+#include <X11/fonts/fontutil.h>
#ifndef FONTMODULE
#include <stdio.h>
#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 <X11/fonts/fontmisc.h> /* 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 <ctype.h>
#endif
-#include "fntfilst.h"
-#include "fontutil.h"
+#include <X11/fonts/fntfilst.h>
+#include <X11/fonts/fontutil.h>
/* use bitmap structure */
-#include "bitmap.h"
+#include <X11/fonts/bitmap.h>
#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 <stdarg.h>
#endif
-#include "fntfilst.h"
+#include <X11/fonts/fntfilst.h>
#include <X11/fonts/fontstruct.h>
/* use bitmap structure */
-#include "bitmap.h"
+#include <X11/fonts/bitmap.h>
#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 <X11/fonts/fntfilst.h>
+#include <X11/fonts/bitmap.h>
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 <X11/fonts/fntfilst.h>
+#include <X11/fonts/bitmap.h>
+#include <X11/fonts/fontutil.h>
#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 <X11/fonts/fntfilst.h>
+#include <X11/fonts/bitmap.h>
#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 <X11/fonts/fntfilst.h>
+#include <X11/fonts/bitmap.h>
+#include <X11/fonts/fontutil.h>
#ifndef FONTMODULE
#ifdef _XOPEN_SOURCE
#include <math.h>
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 <X11/fonts/fntfilst.h>
+#include <X11/fonts/bitmap.h>
#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 <X11/fonts/fntfilst.h>
+#include <X11/fonts/bitmap.h>
#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 <X11/fonts/fntfilst.h>
+#include <X11/fonts/bitmap.h>
#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 <ctype.h>
#endif
-#include "fntfilst.h"
-#include "bitmap.h"
+#include <X11/fonts/fntfilst.h>
+#include <X11/fonts/bitmap.h>
#include "snfstr.h"
#include <stdarg.h>
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 <X11/fonts/fntfilio.h>
/*-
* 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 <X11/Xdefs.h>
#include <X11/fonts/font.h>
-#include "fontxlfd.h"
-#include "fntfil.h"
-#include "fntfilio.h"
-#include "fntfilst.h"
+#include <X11/fonts/fontxlfd.h>
+#include <X11/fonts/fntfil.h>
+#include <X11/fonts/fntfilio.h>
+#include <X11/fonts/fntfilst.h>
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 <X11/fonts/fntfilst.h>
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 <X11/fonts/fntfilst.h>
#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 <X11/Xpoll.h>
#include <X11/fonts/FS.h>
#include <X11/fonts/FSproto.h>
-#include "fontmisc.h"
+#include <X11/fonts/fontmisc.h>
#include <X11/fonts/fontstruct.h>
#include "fservestr.h"
-#include "fontutil.h"
+#include <X11/fonts/fontutil.h>
#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 <X11/fonts/FSproto.h>
#include <X11/X.h>
#include <X11/Xos.h>
-#include "fontmisc.h"
+#include <X11/fonts/fontmisc.h>
#include <X11/fonts/fontstruct.h>
#include "fservestr.h"
-#include "fontutil.h"
+#include <X11/fonts/fontutil.h>
#include <errno.h>
#include <time.h>
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 <X11/fonts/FS.h>
#include <X11/fonts/FSproto.h>
-#include "fontmisc.h"
+#include <X11/fonts/fontmisc.h>
#include <X11/fonts/fontstruct.h>
#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 <X11/fonts/fontmisc.h>
#include <X11/fonts/fontstruct.h>
#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 <X11/fonts/fntfilst.h>
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 <X11/Xos.h>
-#include <fontmisc.h>
-#include <bufio.h>
+#include <X11/fonts/fontmisc.h>
+#include <X11/fonts/bufio.h>
#include <errno.h>
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 <bufio.h>
+#include <X11/fonts/fontmisc.h>
+#include <X11/fonts/bufio.h>
#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 <X11/fonts/fntfilst.h>
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 <X11/fonts/fntfilst.h>
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
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 <X11/fonts/fntfilst.h>
+#include <X11/fonts/bitmap.h>
#ifdef LOADABLEFONTS
-#include "fontmod.h"
+#include <X11/fonts/fontmod.h>
#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 <fntfilio.h>
+#include <X11/fonts/fntfilio.h>
#include <X11/Xos.h>
#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 <fntfilio.h>
+#include <X11/fonts/fntfilio.h>
#include <X11/Xos.h>
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 <X11/fonts/fntfilst.h>
#include <X11/keysym.h>
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 <X11/fonts/fontenc.h>
-#include "fontencc.h"
+#include <X11/fonts/fontencc.h>
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 <X11/fonts/fntfilst.h>
#ifdef WIN32
#include <ctype.h>
#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 <X11/fonts/fntfilst.h>
#ifdef _XOPEN_SOURCE
#include <math.h>
#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 <bufio.h>
+#include <X11/fonts/fontmisc.h>
+#include <X11/fonts/bufio.h>
#include <zlib.h>
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 <X11/fonts/fntfilst.h>
/*
* 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 <X11/fonts/fontmisc.h>
+#include <X11/fonts/fntfilst.h>
+#include <X11/fonts/bitmap.h>
#ifdef LOADABLEFONTS
-#include "fontmod.h"
+#include <X11/fonts/fontmod.h>
#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 <X11/fonts/fntfilst.h>
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 <stdio.h>
-#include "fntfilst.h"
+#include <X11/fonts/fntfilst.h>
#include <X11/fonts/font.h>
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 <X11/fonts/fontmisc.h>
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 <X11/fonts/fontmisc.h>
#include <X11/fonts/fontstruct.h>
-#include "fontutil.h"
+#include <X11/fonts/fontutil.h>
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 <X11/fonts/fontmisc.h>
#include <X11/fonts/fontstruct.h>
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 <X11/fonts/fontmisc.h>
#include <X11/fonts/fontstruct.h>
#include <X11/fonts/FSproto.h>
-#include "fontutil.h"
+#include <X11/fonts/fontutil.h>
/* 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 <X11/fonts/fontmisc.h>
#include <X11/fonts/fontstruct.h>
-#include "fontxlfd.h"
-#include "fontutil.h"
+#include <X11/fonts/fontxlfd.h>
+#include <X11/fonts/fontutil.h>
#include <X11/Xos.h>
#include <math.h>
#include <stdlib.h>
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 <X11/fonts/FSproto.h>
#include <X11/fonts/font.h>
#include <X11/fonts/fontstruct.h>
-#include "fontutil.h"
+#include <X11/fonts/fontutil.h>
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 <X11/Xosdefs.h>
#include <stdlib.h>
-#include "fontmisc.h"
+#include <X11/fonts/fontmisc.h>
#define XK_LATIN1
#include <X11/keysymdef.h>
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 <fontmisc.h>
+#include <X11/fonts/fontmisc.h>
#include <X11/fonts/fontstruct.h>
/*
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 <X11/fonts/fontmisc.h>
#include <X11/fonts/fontstruct.h>
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 <X11/fonts/fontmisc.h>
/* Utility functions for reformating font bitmaps */