summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/FreeType/ftenc.c3
-rw-r--r--src/FreeType/ftfuncs.c5
-rw-r--r--src/FreeType/ftsystem.c3
-rw-r--r--src/FreeType/fttools.c3
-rw-r--r--src/FreeType/xttcap.c3
-rw-r--r--src/Speedo/bics-unicode.c3
-rw-r--r--src/Speedo/do_char.c3
-rw-r--r--src/Speedo/do_trns.c3
-rw-r--r--src/Speedo/out_bl2d.c3
-rw-r--r--src/Speedo/out_blk.c3
-rw-r--r--src/Speedo/out_outl.c3
-rw-r--r--src/Speedo/out_scrn.c3
-rw-r--r--src/Speedo/out_util.c3
-rw-r--r--src/Speedo/reset.c3
-rw-r--r--src/Speedo/set_spcs.c3
-rw-r--r--src/Speedo/set_trns.c3
-rw-r--r--src/Speedo/spencode.c3
-rw-r--r--src/Speedo/sperr.c3
-rw-r--r--src/Speedo/spfile.c3
-rw-r--r--src/Speedo/spfont.c3
-rw-r--r--src/Speedo/spfuncs.c3
-rw-r--r--src/Speedo/spglyph.c3
-rw-r--r--src/Speedo/spinfo.c3
-rw-r--r--src/Type1/afm.c3
-rw-r--r--src/Type1/arith.c3
-rw-r--r--src/Type1/cidchar.c3
-rw-r--r--src/Type1/curves.c3
-rw-r--r--src/Type1/fontfcn.c3
-rw-r--r--src/Type1/hints.c3
-rw-r--r--src/Type1/lines.c3
-rw-r--r--src/Type1/objects.c3
-rw-r--r--src/Type1/paths.c3
-rw-r--r--src/Type1/regions.c3
-rw-r--r--src/Type1/scanfont.c5
-rw-r--r--src/Type1/spaces.c3
-rw-r--r--src/Type1/t1funcs.c3
-rw-r--r--src/Type1/t1info.c3
-rw-r--r--src/Type1/t1io.c3
-rw-r--r--src/Type1/t1malloc.c3
-rw-r--r--src/Type1/t1snap.c3
-rw-r--r--src/Type1/t1stub.c3
-rw-r--r--src/Type1/t1unicode.c3
-rw-r--r--src/Type1/token.c3
-rw-r--r--src/Type1/type1.c3
-rw-r--r--src/Type1/util.c3
-rw-r--r--src/bitmap/bdfread.c4
-rw-r--r--src/bitmap/bdfutils.c4
-rw-r--r--src/bitmap/bitmap.c4
-rw-r--r--src/bitmap/bitmapfunc.c4
-rw-r--r--src/bitmap/bitmaputil.c4
-rw-r--r--src/bitmap/bitscale.c4
-rw-r--r--src/bitmap/fontink.c4
-rw-r--r--src/bitmap/pcfread.c4
-rw-r--r--src/bitmap/pcfwrite.c3
-rw-r--r--src/bitmap/snfread.c4
-rw-r--r--src/builtins/dir.c3
-rw-r--r--src/builtins/file.c3
-rw-r--r--src/builtins/fonts.c3
-rw-r--r--src/builtins/fpe.c3
-rw-r--r--src/builtins/render.c3
-rw-r--r--src/fc/fsconvert.c3
-rw-r--r--src/fc/fserve.c4
-rw-r--r--src/fc/fsio.c2
-rw-r--r--src/fontcache/fontcache.c3
-rw-r--r--src/fontfile/bitsource.c3
-rw-r--r--src/fontfile/bufio.c3
-rw-r--r--src/fontfile/decompress.c3
-rw-r--r--src/fontfile/defaults.c3
-rw-r--r--src/fontfile/dirfile.c3
-rw-r--r--src/fontfile/ffcheck.c3
-rw-r--r--src/fontfile/fileio.c3
-rw-r--r--src/fontfile/filewr.c3
-rw-r--r--src/fontfile/fontdir.c5
-rw-r--r--src/fontfile/fontencc.c3
-rw-r--r--src/fontfile/fontfile.c5
-rw-r--r--src/fontfile/fontscale.c3
-rw-r--r--src/fontfile/gunzip.c3
-rw-r--r--src/fontfile/printerfont.c3
-rw-r--r--src/fontfile/register.c3
-rw-r--r--src/fontfile/renderers.c3
-rw-r--r--src/stubs/cauthgen.c3
-rw-r--r--src/stubs/csignal.c3
-rw-r--r--src/stubs/delfntcid.c3
-rw-r--r--src/stubs/errorf.c3
-rw-r--r--src/stubs/fatalerror.c3
-rw-r--r--src/stubs/findoldfnt.c3
-rw-r--r--src/stubs/getcres.c3
-rw-r--r--src/stubs/getdefptsize.c3
-rw-r--r--src/stubs/getnewfntcid.c3
-rw-r--r--src/stubs/gettime.c3
-rw-r--r--src/stubs/initfshdl.c3
-rw-r--r--src/stubs/regfpefunc.c3
-rw-r--r--src/stubs/rmfshdl.c3
-rw-r--r--src/stubs/setfntauth.c3
-rw-r--r--src/stubs/stfntcfnt.c3
-rw-r--r--src/stubs/xpstubs.c3
-rw-r--r--src/util/atom.c3
-rw-r--r--src/util/fontaccel.c3
-rw-r--r--src/util/fontnames.c3
-rw-r--r--src/util/fontutil.c3
-rw-r--r--src/util/fontxlfd.c3
-rw-r--r--src/util/format.c3
-rw-r--r--src/util/miscutil.c3
-rw-r--r--src/util/patcache.c3
-rw-r--r--src/util/private.c3
-rw-r--r--src/util/utilbitmap.c3
106 files changed, 328 insertions, 7 deletions
diff --git a/src/FreeType/ftenc.c b/src/FreeType/ftenc.c
index dcd626a..a9d6494 100644
--- a/src/FreeType/ftenc.c
+++ b/src/FreeType/ftenc.c
@@ -21,6 +21,9 @@ THE SOFTWARE.
*/
/* $XFree86: xc/lib/font/FreeType/ftenc.c,v 1.24 2003/10/19 18:53:49 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#ifndef FONTMODULE
#include <string.h>
#else
diff --git a/src/FreeType/ftfuncs.c b/src/FreeType/ftfuncs.c
index 769a27a..8714846 100644
--- a/src/FreeType/ftfuncs.c
+++ b/src/FreeType/ftfuncs.c
@@ -25,10 +25,13 @@ 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.10 2005/05/27 17:44:07 josh Exp $ */
+/* $XdotOrg: xc/lib/font/FreeType/ftfuncs.c,v 1.11 2005/07/03 07:00:58 daniels Exp $ */
/* $XFree86: xc/lib/font/FreeType/ftfuncs.c,v 1.43 2004/02/07 04:37:18 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/fonts/fontmisc.h>
#ifndef FONTMODULE
diff --git a/src/FreeType/ftsystem.c b/src/FreeType/ftsystem.c
index 2378364..90c51c1 100644
--- a/src/FreeType/ftsystem.c
+++ b/src/FreeType/ftsystem.c
@@ -30,6 +30,9 @@
/*************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <ft2build.h>
#include FT_CONFIG_CONFIG_H
#include FT_INTERNAL_DEBUG_H
diff --git a/src/FreeType/fttools.c b/src/FreeType/fttools.c
index 8302778..9251838 100644
--- a/src/FreeType/fttools.c
+++ b/src/FreeType/fttools.c
@@ -23,6 +23,9 @@
/* $XFree86: xc/lib/font/FreeType/fttools.c,v 1.6 2003/06/08 15:41:13 herrb Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/fonts/fontmisc.h>
#ifndef FONTMODULE
#include <ctype.h>
diff --git a/src/FreeType/xttcap.c b/src/FreeType/xttcap.c
index b6e2a24..2040c16 100644
--- a/src/FreeType/xttcap.c
+++ b/src/FreeType/xttcap.c
@@ -39,6 +39,9 @@ static char const * const releaseID =
_XTT_RELEASE_NAME;
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/fonts/fontmisc.h>
#ifndef FONTMODULE
#include <string.h>
diff --git a/src/Speedo/bics-unicode.c b/src/Speedo/bics-unicode.c
index d1733cb..7355082 100644
--- a/src/Speedo/bics-unicode.c
+++ b/src/Speedo/bics-unicode.c
@@ -24,6 +24,9 @@ THE SOFTWARE.
/* These data are very dodgy. */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "bics-unicode.h"
static short table_160[]=
diff --git a/src/Speedo/do_char.c b/src/Speedo/do_char.c
index c45bb5f..410d633 100644
--- a/src/Speedo/do_char.c
+++ b/src/Speedo/do_char.c
@@ -30,6 +30,9 @@ WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT.
* *
****************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "spdo_prv.h" /* General definitions for Speedo */
#define DEBUG 0
diff --git a/src/Speedo/do_trns.c b/src/Speedo/do_trns.c
index 2e397e8..2e0f1db 100644
--- a/src/Speedo/do_trns.c
+++ b/src/Speedo/do_trns.c
@@ -31,6 +31,9 @@ WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT.
****************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "spdo_prv.h" /* General definitions for Speedo */
#define DEBUG 0
diff --git a/src/Speedo/out_bl2d.c b/src/Speedo/out_bl2d.c
index 61995e1..6c38cb3 100644
--- a/src/Speedo/out_bl2d.c
+++ b/src/Speedo/out_bl2d.c
@@ -29,6 +29,9 @@ WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT.
****************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "spdo_prv.h" /* General definitions for speedo */
#define CLOCKWISE 1
diff --git a/src/Speedo/out_blk.c b/src/Speedo/out_blk.c
index 3ecefcc..a5b669b 100644
--- a/src/Speedo/out_blk.c
+++ b/src/Speedo/out_blk.c
@@ -31,6 +31,9 @@ WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT.
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "spdo_prv.h" /* General definitions for Speedo */
#define DEBUG 0
diff --git a/src/Speedo/out_outl.c b/src/Speedo/out_outl.c
index bebc684..0139010 100644
--- a/src/Speedo/out_outl.c
+++ b/src/Speedo/out_outl.c
@@ -30,6 +30,9 @@ WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT.
****************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "spdo_prv.h" /* General definitions for Speedo */
diff --git a/src/Speedo/out_scrn.c b/src/Speedo/out_scrn.c
index 8e1b48f..0ea3b19 100644
--- a/src/Speedo/out_scrn.c
+++ b/src/Speedo/out_scrn.c
@@ -31,6 +31,9 @@ WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT.
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "spdo_prv.h" /* General definitions for Speedo */
#define DEBUG 0
diff --git a/src/Speedo/out_util.c b/src/Speedo/out_util.c
index a6f02f0..1712410 100644
--- a/src/Speedo/out_util.c
+++ b/src/Speedo/out_util.c
@@ -24,6 +24,9 @@ WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT.
/* $XFree86: xc/lib/font/Speedo/out_util.c,v 1.2 1999/02/07 06:18:17 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#define DEBUG 0
/*************************** O U T _ U T I L . C *****************************
diff --git a/src/Speedo/reset.c b/src/Speedo/reset.c
index 982d644..4cb9f7d 100644
--- a/src/Speedo/reset.c
+++ b/src/Speedo/reset.c
@@ -31,6 +31,9 @@ WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT.
* *
****************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "spdo_prv.h" /* General definitions for Speedo */
#include "keys.h" /* Font decryption keys */
diff --git a/src/Speedo/set_spcs.c b/src/Speedo/set_spcs.c
index df45943..b69b13f 100644
--- a/src/Speedo/set_spcs.c
+++ b/src/Speedo/set_spcs.c
@@ -29,6 +29,9 @@ WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT.
* This module implements all sp_set_specs() functionality. *
* *
****************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#define SET_SPCS
#include "spdo_prv.h" /* General definitions for Speedo */
#include "keys.h"
diff --git a/src/Speedo/set_trns.c b/src/Speedo/set_trns.c
index 18cdb46..3b8f603 100644
--- a/src/Speedo/set_trns.c
+++ b/src/Speedo/set_trns.c
@@ -34,6 +34,9 @@ WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT.
****************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "spdo_prv.h" /* General definitions for Speedo */
#define DEBUG 0
diff --git a/src/Speedo/spencode.c b/src/Speedo/spencode.c
index b06798c..96a1350 100644
--- a/src/Speedo/spencode.c
+++ b/src/Speedo/spencode.c
@@ -49,6 +49,9 @@ from The Open Group.
*/
/* $XFree86: xc/lib/font/Speedo/spencode.c,v 1.6 2001/01/17 19:43:18 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "spint.h"
/* No longer needed with new encoding code */
diff --git a/src/Speedo/sperr.c b/src/Speedo/sperr.c
index 82ed532..36ce511 100644
--- a/src/Speedo/sperr.c
+++ b/src/Speedo/sperr.c
@@ -54,6 +54,9 @@ from The Open Group.
*/
/* $XFree86: xc/lib/font/Speedo/sperr.c,v 1.6 2001/12/14 19:56:41 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "spint.h"
#ifndef FONTMODULE
diff --git a/src/Speedo/spfile.c b/src/Speedo/spfile.c
index c3bd9b4..c58c0e4 100644
--- a/src/Speedo/spfile.c
+++ b/src/Speedo/spfile.c
@@ -51,6 +51,9 @@ from The Open Group.
*/
/* $XFree86: xc/lib/font/Speedo/spfile.c,v 1.13 2001/08/13 21:46:47 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/fonts/fntfilst.h>
#include <X11/fonts/fontenc.h>
#ifndef FONTMODULE
diff --git a/src/Speedo/spfont.c b/src/Speedo/spfont.c
index 14d47b7..c209d5a 100644
--- a/src/Speedo/spfont.c
+++ b/src/Speedo/spfont.c
@@ -55,6 +55,9 @@ from The Open Group.
* Speedo font loading
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/fonts/FSproto.h>
#include "spint.h"
#include <X11/fonts/fontutil.h>
diff --git a/src/Speedo/spfuncs.c b/src/Speedo/spfuncs.c
index 840f0e1..da4d5c5 100644
--- a/src/Speedo/spfuncs.c
+++ b/src/Speedo/spfuncs.c
@@ -51,6 +51,9 @@ from The Open Group.
*/
/* $XFree86: xc/lib/font/Speedo/spfuncs.c,v 1.7 2001/08/27 19:49:51 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#ifndef FONTMODULE
#include <X11/Xos.h>
#endif
diff --git a/src/Speedo/spglyph.c b/src/Speedo/spglyph.c
index dbf47b9..3577f55 100644
--- a/src/Speedo/spglyph.c
+++ b/src/Speedo/spglyph.c
@@ -51,6 +51,9 @@ from The Open Group.
*/
/* $XFree86: xc/lib/font/Speedo/spglyph.c,v 1.6 2001/01/17 19:43:20 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/X.h> /* for bit order #defines */
#include "spint.h"
#include <X11/fonts/fontutil.h>
diff --git a/src/Speedo/spinfo.c b/src/Speedo/spinfo.c
index 054b46e..d7a1edd 100644
--- a/src/Speedo/spinfo.c
+++ b/src/Speedo/spinfo.c
@@ -51,6 +51,9 @@ from The Open Group.
*/
/* $XFree86: xc/lib/font/Speedo/spinfo.c,v 1.12 2001/12/14 19:56:42 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/fonts/fntfilst.h>
#include <X11/fonts/fontutil.h>
#include "spint.h"
diff --git a/src/Type1/afm.c b/src/Type1/afm.c
index c930ae7..0f7c510 100644
--- a/src/Type1/afm.c
+++ b/src/Type1/afm.c
@@ -17,6 +17,9 @@
*/
/* $XFree86: xc/lib/font/Type1/afm.c,v 1.2 1999/08/21 13:47:38 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#ifdef BUILDCID
#ifndef FONTMODULE
#include <stdio.h>
diff --git a/src/Type1/arith.c b/src/Type1/arith.c
index 35191d9..9611543 100644
--- a/src/Type1/arith.c
+++ b/src/Type1/arith.c
@@ -50,6 +50,9 @@ assembly language, unlike C, will have 64-bit multiply products and
The included files are:
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#ifdef FONTMODULE
# include "os.h"
#endif
diff --git a/src/Type1/cidchar.c b/src/Type1/cidchar.c
index fad8801..c0d1498 100644
--- a/src/Type1/cidchar.c
+++ b/src/Type1/cidchar.c
@@ -17,6 +17,9 @@
*/
/* $XFree86: xc/lib/font/Type1/cidchar.c,v 1.9tsi Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#ifdef BUILDCID
#ifndef FONTMODULE
#include <stdio.h>
diff --git a/src/Type1/curves.c b/src/Type1/curves.c
index b26c35c..9d0c3f8 100644
--- a/src/Type1/curves.c
+++ b/src/Type1/curves.c
@@ -43,6 +43,9 @@ through.
Include files needed:
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#ifdef FONTMODULE
# include "os.h"
#endif
diff --git a/src/Type1/fontfcn.c b/src/Type1/fontfcn.c
index 081d81b..5b13b5e 100644
--- a/src/Type1/fontfcn.c
+++ b/src/Type1/fontfcn.c
@@ -47,6 +47,9 @@
*/
/* $XFree86: xc/lib/font/Type1/fontfcn.c,v 1.10 2001/04/05 17:42:27 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#ifndef FONTMODULE
#include <stdio.h>
#include <string.h>
diff --git a/src/Type1/hints.c b/src/Type1/hints.c
index 78aff15..14deac2 100644
--- a/src/Type1/hints.c
+++ b/src/Type1/hints.c
@@ -40,6 +40,9 @@ W. Pryor, Jr.
The included files are:
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#ifdef FONTMODULE
# include "os.h"
#endif
diff --git a/src/Type1/lines.c b/src/Type1/lines.c
index c2b0028..835afc6 100644
--- a/src/Type1/lines.c
+++ b/src/Type1/lines.c
@@ -40,6 +40,9 @@
The included files are:
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "objects.h"
#include "spaces.h"
#include "paths.h"
diff --git a/src/Type1/objects.c b/src/Type1/objects.c
index ca296e7..70857a3 100644
--- a/src/Type1/objects.c
+++ b/src/Type1/objects.c
@@ -45,6 +45,9 @@ object type.
The included files are:
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#define GLOBALS 1 /* see :hdref refid=debugvar. */
/*
The following two includes are C standards; we include them because we
diff --git a/src/Type1/paths.c b/src/Type1/paths.c
index 6860ca1..1ab25ec 100644
--- a/src/Type1/paths.c
+++ b/src/Type1/paths.c
@@ -44,6 +44,9 @@ The included files are:
*/
/* after the system includes (dsr) */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#ifdef FONTMODULE
# include "os.h"
#endif
diff --git a/src/Type1/regions.c b/src/Type1/regions.c
index 4d110ea..f8875da 100644
--- a/src/Type1/regions.c
+++ b/src/Type1/regions.c
@@ -41,6 +41,9 @@ This module is responsible for creating and manipulating regions.
The included files are:
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#ifdef FONTMODULE
# include "os.h"
#endif
diff --git a/src/Type1/scanfont.c b/src/Type1/scanfont.c
index 1ccef28..357c5fa 100644
--- a/src/Type1/scanfont.c
+++ b/src/Type1/scanfont.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/lib/font/Type1/scanfont.c,v 1.2 2004/04/23 18:44:09 eich Exp $ */
+/* $XdotOrg: xc/lib/font/Type1/scanfont.c,v 1.3 2005/07/03 07:00:59 daniels Exp $ */
/* $Xorg: scanfont.c,v 1.3 2000/08/17 19:46:32 cpqbld Exp $ */
/* Copyright International Business Machines,Corp. 1991
* All Rights Reserved
@@ -48,6 +48,9 @@
*/
/* $XFree86: xc/lib/font/Type1/scanfont.c,v 1.16 2003/05/27 22:26:46 tsi Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#ifndef FONTMODULE
#include <string.h>
#else
diff --git a/src/Type1/spaces.c b/src/Type1/spaces.c
index 52e1105..a193161 100644
--- a/src/Type1/spaces.c
+++ b/src/Type1/spaces.c
@@ -39,6 +39,9 @@ This module is responsible for handling the TYPE1IMAGER "XYspace" object.
:h3.Include Files
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#ifdef FONTMODULE
#include "Xdefs.h" /* Bool declaration ??? */
#include "Xmd.h" /* INT32 declaration ??? */
diff --git a/src/Type1/t1funcs.c b/src/Type1/t1funcs.c
index cae0e04..8845e8e 100644
--- a/src/Type1/t1funcs.c
+++ b/src/Type1/t1funcs.c
@@ -101,6 +101,9 @@ from The Open Group.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#ifndef FONTMODULE
#include <string.h>
#ifdef BUILDCID
diff --git a/src/Type1/t1info.c b/src/Type1/t1info.c
index 50862b8..900e63f 100644
--- a/src/Type1/t1info.c
+++ b/src/Type1/t1info.c
@@ -101,6 +101,9 @@ from The Open Group.
*/
/* $XFree86: xc/lib/font/Type1/t1info.c,v 1.18tsi Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/fonts/fntfilst.h>
#include <X11/fonts/fontutil.h>
#ifndef FONTMODULE
diff --git a/src/Type1/t1io.c b/src/Type1/t1io.c
index db3a05e..fdf6972 100644
--- a/src/Type1/t1io.c
+++ b/src/Type1/t1io.c
@@ -50,6 +50,9 @@
* I/O package for Type 1 font reading
********************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#ifndef STATIC
#define STATIC static
#endif
diff --git a/src/Type1/t1malloc.c b/src/Type1/t1malloc.c
index d311d1e..f59a949 100644
--- a/src/Type1/t1malloc.c
+++ b/src/Type1/t1malloc.c
@@ -38,6 +38,9 @@ routines (malloc/free).
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#ifdef FONTMODULE
#include "Xdefs.h" /* Bool declaration */
#include "Xmd.h" /* INT32 declaration */
diff --git a/src/Type1/t1snap.c b/src/Type1/t1snap.c
index 96b99f2..5618b58 100644
--- a/src/Type1/t1snap.c
+++ b/src/Type1/t1snap.c
@@ -30,6 +30,9 @@
/* $XFree86: xc/lib/font/Type1/t1snap.c,v 1.3 1999/08/22 08:58:54 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "objects.h"
#include "spaces.h"
#include "paths.h"
diff --git a/src/Type1/t1stub.c b/src/Type1/t1stub.c
index 1ced8ef..2fb1d79 100644
--- a/src/Type1/t1stub.c
+++ b/src/Type1/t1stub.c
@@ -29,6 +29,9 @@
*/
/* $XFree86: xc/lib/font/Type1/t1stub.c,v 1.8 2001/01/17 19:43:24 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#ifdef FONTMODULE
#include "Xdefs.h" /* Bool declaration */
#include "Xmd.h" /* INT32 declaration */
diff --git a/src/Type1/t1unicode.c b/src/Type1/t1unicode.c
index 96f646d..136cc44 100644
--- a/src/Type1/t1unicode.c
+++ b/src/Type1/t1unicode.c
@@ -22,6 +22,9 @@ THE SOFTWARE.
/* $XFree86$ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "t1unicode.h"
static char* table_32[] =
diff --git a/src/Type1/token.c b/src/Type1/token.c
index 0ec1947..71a968b 100644
--- a/src/Type1/token.c
+++ b/src/Type1/token.c
@@ -29,6 +29,9 @@
*/
/* $XFree86: xc/lib/font/Type1/token.c,v 1.5tsi Exp $ */
/* Authors: Sig Nin & Carol Thompson IBM Almaden Research Laboratory */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "t1stdio.h"
#include "util.h"
#include "digit.h"
diff --git a/src/Type1/type1.c b/src/Type1/type1.c
index e68ee5c..c929a35 100644
--- a/src/Type1/type1.c
+++ b/src/Type1/type1.c
@@ -64,6 +64,9 @@
/******************/
/* Include Files: */
/******************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#ifndef FONTMODULE
#include <stdio.h> /* a system-dependent include, usually */
#include <math.h>
diff --git a/src/Type1/util.c b/src/Type1/util.c
index a2eaafd..1c6048b 100644
--- a/src/Type1/util.c
+++ b/src/Type1/util.c
@@ -47,6 +47,9 @@
/* $XFree86: xc/lib/font/Type1/util.c,v 1.5 1999/08/21 13:47:53 dawes Exp $ */
/* Author: Katherine A. Hitchcock IBM Almaden Research Laboratory */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#ifndef FONTMODULE
#include <stdio.h>
#else
diff --git a/src/bitmap/bdfread.c b/src/bitmap/bdfread.c
index dc56a89..acb77e9 100644
--- a/src/bitmap/bdfread.c
+++ b/src/bitmap/bdfread.c
@@ -52,6 +52,10 @@ from The Open Group.
*/
/* $XFree86: xc/lib/font/bitmap/bdfread.c,v 1.12tsi Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#ifndef FONTMODULE
#include <ctype.h>
#endif
diff --git a/src/bitmap/bdfutils.c b/src/bitmap/bdfutils.c
index 0155833..a0c5ae9 100644
--- a/src/bitmap/bdfutils.c
+++ b/src/bitmap/bdfutils.c
@@ -51,6 +51,10 @@ from The Open Group.
*/
/* $XFree86: xc/lib/font/bitmap/bdfutils.c,v 1.10 2001/12/14 19:56:45 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#ifndef FONTMODULE
#include <ctype.h>
#include <stdio.h>
diff --git a/src/bitmap/bitmap.c b/src/bitmap/bitmap.c
index eb6caf2..d238f4d 100644
--- a/src/bitmap/bitmap.c
+++ b/src/bitmap/bitmap.c
@@ -31,6 +31,10 @@ in this Software without prior written authorization from The Open Group.
* Author: Keith Packard, MIT X Consortium
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <X11/fonts/fntfilst.h>
#include <X11/fonts/bitmap.h>
diff --git a/src/bitmap/bitmapfunc.c b/src/bitmap/bitmapfunc.c
index a21680b..36356fd 100644
--- a/src/bitmap/bitmapfunc.c
+++ b/src/bitmap/bitmapfunc.c
@@ -32,6 +32,10 @@ in this Software without prior written authorization from The Open Group.
* Author: Keith Packard, MIT X Consortium
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <X11/fonts/fntfilst.h>
#include <X11/fonts/bitmap.h>
#include <X11/fonts/fontutil.h>
diff --git a/src/bitmap/bitmaputil.c b/src/bitmap/bitmaputil.c
index 6d2cb28..3487f7f 100644
--- a/src/bitmap/bitmaputil.c
+++ b/src/bitmap/bitmaputil.c
@@ -29,6 +29,10 @@ from The Open Group.
*/
/* $XFree86: xc/lib/font/bitmap/bitmaputil.c,v 1.10 2002/09/24 20:52:48 tsi Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <X11/fonts/fntfilst.h>
#include <X11/fonts/bitmap.h>
#include <X11/fonts/bdfint.h>
diff --git a/src/bitmap/bitscale.c b/src/bitmap/bitscale.c
index e03da0c..3e49ecf 100644
--- a/src/bitmap/bitscale.c
+++ b/src/bitmap/bitscale.c
@@ -32,6 +32,10 @@ from The Open Group.
* Author: Keith Packard, MIT X Consortium
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <X11/fonts/fntfilst.h>
#include <X11/fonts/bitmap.h>
#include <X11/fonts/fontutil.h>
diff --git a/src/bitmap/fontink.c b/src/bitmap/fontink.c
index fed4b24..a9606f0 100644
--- a/src/bitmap/fontink.c
+++ b/src/bitmap/fontink.c
@@ -33,6 +33,10 @@ from The Open Group.
* Author: Keith Packard, MIT X Consortium
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <X11/fonts/fntfilst.h>
#include <X11/fonts/bitmap.h>
#include <X11/fonts/bdfint.h>
diff --git a/src/bitmap/pcfread.c b/src/bitmap/pcfread.c
index 06c9ff3..dd76868 100644
--- a/src/bitmap/pcfread.c
+++ b/src/bitmap/pcfread.c
@@ -32,6 +32,10 @@ from The Open Group.
* Author: Keith Packard, MIT X Consortium
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <X11/fonts/fntfilst.h>
#include <X11/fonts/bitmap.h>
#include <X11/fonts/pcf.h>
diff --git a/src/bitmap/pcfwrite.c b/src/bitmap/pcfwrite.c
index bdf754f..8d5e942 100644
--- a/src/bitmap/pcfwrite.c
+++ b/src/bitmap/pcfwrite.c
@@ -32,6 +32,9 @@ from The Open Group.
* Author: Keith Packard, MIT X Consortium
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/fonts/fntfilst.h>
#include <X11/fonts/bitmap.h>
diff --git a/src/bitmap/snfread.c b/src/bitmap/snfread.c
index c8bbee0..01b6bf3 100644
--- a/src/bitmap/snfread.c
+++ b/src/bitmap/snfread.c
@@ -51,6 +51,10 @@ from The Open Group.
*/
/* $XFree86: xc/lib/font/bitmap/snfread.c,v 1.12 2003/11/17 22:20:22 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#ifndef FONTMODULE
#include <ctype.h>
#endif
diff --git a/src/builtins/dir.c b/src/builtins/dir.c
index 52b1958..fb2f82c 100644
--- a/src/builtins/dir.c
+++ b/src/builtins/dir.c
@@ -24,6 +24,9 @@
*/
/* $XFree86: xc/lib/font/builtins/dir.c,v 1.3 1999/12/30 02:29:49 robin Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "builtin.h"
int
diff --git a/src/builtins/file.c b/src/builtins/file.c
index 549c0bf..024c353 100644
--- a/src/builtins/file.c
+++ b/src/builtins/file.c
@@ -24,6 +24,9 @@
*/
/* $XFree86: xc/lib/font/builtins/file.c,v 1.3 1999/12/30 02:29:49 robin Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "builtin.h"
typedef struct _BuiltinIO {
diff --git a/src/builtins/fonts.c b/src/builtins/fonts.c
index 6fef13f..30c762f 100644
--- a/src/builtins/fonts.c
+++ b/src/builtins/fonts.c
@@ -24,6 +24,9 @@
*/
/* $XFree86: xc/lib/font/builtins/fonts.c,v 1.3 1999/12/30 02:29:49 robin Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "builtin.h"
static const char file_6x13[] = {
diff --git a/src/builtins/fpe.c b/src/builtins/fpe.c
index b5c67ce..58cfd59 100644
--- a/src/builtins/fpe.c
+++ b/src/builtins/fpe.c
@@ -24,6 +24,9 @@
*/
/* $XFree86: xc/lib/font/builtins/fpe.c,v 1.3 1999/12/30 02:29:51 robin Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/fonts/fntfilst.h>
static int font_file_type;
diff --git a/src/builtins/render.c b/src/builtins/render.c
index 8f8536a..5e8c5ae 100644
--- a/src/builtins/render.c
+++ b/src/builtins/render.c
@@ -24,6 +24,9 @@
*/
/* $XFree86: xc/lib/font/builtins/render.c,v 1.3 1999/12/30 02:29:51 robin Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/fonts/fntfilst.h>
#include "builtin.h"
diff --git a/src/fc/fsconvert.c b/src/fc/fsconvert.c
index ea2b45b..9ff54f5 100644
--- a/src/fc/fsconvert.c
+++ b/src/fc/fsconvert.c
@@ -27,6 +27,9 @@
* FS data conversion
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/X.h>
#include <X11/Xtrans/Xtrans.h>
#include <X11/Xpoll.h>
diff --git a/src/fc/fserve.c b/src/fc/fserve.c
index 4d226f5..dbb6f21 100644
--- a/src/fc/fserve.c
+++ b/src/fc/fserve.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/lib/font/fc/fserve.c,v 1.4 2005/06/09 15:52:03 ago Exp $ */
+/* $XdotOrg: xc/lib/font/fc/fserve.c,v 1.7 2005/07/08 19:53:05 ajax Exp $ */
/* $Xorg: fserve.c,v 1.4 2001/02/09 02:04:02 xorgcvs Exp $ */
/*
@@ -54,7 +54,7 @@ in this Software without prior written authorization from The Open Group.
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
#endif
#ifdef WIN32
diff --git a/src/fc/fsio.c b/src/fc/fsio.c
index 52eaaec..fbfb9df 100644
--- a/src/fc/fsio.c
+++ b/src/fc/fsio.c
@@ -29,7 +29,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
#endif
#ifdef WIN32
diff --git a/src/fontcache/fontcache.c b/src/fontcache/fontcache.c
index 4d44b8f..40cfd63 100644
--- a/src/fontcache/fontcache.c
+++ b/src/fontcache/fontcache.c
@@ -28,6 +28,9 @@
*/
/* $XFree86: xc/lib/font/fontcache/fontcache.c,v 1.4 2001/04/05 17:42:28 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/fontfile/bitsource.c b/src/fontfile/bitsource.c
index 2039fe7..ae27de8 100644
--- a/src/fontfile/bitsource.c
+++ b/src/fontfile/bitsource.c
@@ -31,6 +31,9 @@ in this Software without prior written authorization from The Open Group.
* Author: Keith Packard, MIT X Consortium
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/fonts/fntfilst.h>
BitmapSourcesRec FontFileBitmapSources;
diff --git a/src/fontfile/bufio.c b/src/fontfile/bufio.c
index a6b20e7..43c6a13 100644
--- a/src/fontfile/bufio.c
+++ b/src/fontfile/bufio.c
@@ -34,6 +34,9 @@ from The Open Group.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/Xos.h>
#include <X11/fonts/fontmisc.h>
#include <X11/fonts/bufio.h>
diff --git a/src/fontfile/decompress.c b/src/fontfile/decompress.c
index ca552a1..a4c5468 100644
--- a/src/fontfile/decompress.c
+++ b/src/fontfile/decompress.c
@@ -50,6 +50,9 @@ in this Software without prior written authorization from The Open Group.
* decompress - cat a compressed file
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/fonts/fontmisc.h>
#include <X11/fonts/bufio.h>
diff --git a/src/fontfile/defaults.c b/src/fontfile/defaults.c
index 0091571..7f20cab 100644
--- a/src/fontfile/defaults.c
+++ b/src/fontfile/defaults.c
@@ -31,6 +31,9 @@ in this Software without prior written authorization from The Open Group.
* Author: Keith Packard, MIT X Consortium
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/X.h>
#include <X11/Xproto.h>
diff --git a/src/fontfile/dirfile.c b/src/fontfile/dirfile.c
index 67b1f96..5004922 100644
--- a/src/fontfile/dirfile.c
+++ b/src/fontfile/dirfile.c
@@ -37,6 +37,9 @@ in this Software without prior written authorization from The Open Group.
* Read fonts.dir and fonts.alias files
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/fonts/fntfilst.h>
#include <stdio.h>
#include <sys/types.h>
diff --git a/src/fontfile/ffcheck.c b/src/fontfile/ffcheck.c
index 2c2f7ea..9a70a17 100644
--- a/src/fontfile/ffcheck.c
+++ b/src/fontfile/ffcheck.c
@@ -32,6 +32,9 @@ 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 $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/fonts/fntfilst.h>
#include <X11/fonts/bitmap.h>
#ifdef LOADABLEFONTS
diff --git a/src/fontfile/fileio.c b/src/fontfile/fileio.c
index 61151d5..a3f9464 100644
--- a/src/fontfile/fileio.c
+++ b/src/fontfile/fileio.c
@@ -31,6 +31,9 @@ in this Software without prior written authorization from The Open Group.
* Author: Keith Packard, MIT X Consortium
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/fonts/fntfilio.h>
#include <X11/Xos.h>
#ifndef O_BINARY
diff --git a/src/fontfile/filewr.c b/src/fontfile/filewr.c
index 7feafe7..d076f16 100644
--- a/src/fontfile/filewr.c
+++ b/src/fontfile/filewr.c
@@ -31,6 +31,9 @@ in this Software without prior written authorization from The Open Group.
* Author: Keith Packard, MIT X Consortium
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/fonts/fntfilio.h>
#include <X11/Xos.h>
diff --git a/src/fontfile/fontdir.c b/src/fontfile/fontdir.c
index c20cda6..29fe06b 100644
--- a/src/fontfile/fontdir.c
+++ b/src/fontfile/fontdir.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/lib/font/fontfile/fontdir.c,v 1.3 2004/11/15 15:06:55 ago Exp $ */
+/* $XdotOrg: xc/lib/font/fontfile/fontdir.c,v 1.4 2005/07/03 07:01:00 daniels Exp $ */
/* $Xorg: fontdir.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
/*
@@ -32,6 +32,9 @@ in this Software without prior written authorization from The Open Group.
* Author: Keith Packard, MIT X Consortium
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/fonts/fntfilst.h>
#include <X11/keysym.h>
diff --git a/src/fontfile/fontencc.c b/src/fontfile/fontencc.c
index f88ffcb..b54079a 100644
--- a/src/fontfile/fontencc.c
+++ b/src/fontfile/fontencc.c
@@ -28,6 +28,9 @@ THE SOFTWARE.
*not* provide source compatibility, as many of the data structures
now have different names. */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/fonts/fontenc.h>
#include <X11/fonts/fontencc.h>
diff --git a/src/fontfile/fontfile.c b/src/fontfile/fontfile.c
index 33586a4..73804f8 100644
--- a/src/fontfile/fontfile.c
+++ b/src/fontfile/fontfile.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/lib/font/fontfile/fontfile.c,v 1.3 2004/11/15 15:06:56 ago Exp $ */
+/* $XdotOrg: xc/lib/font/fontfile/fontfile.c,v 1.4 2005/07/03 07:01:00 daniels Exp $ */
/* $Xorg: fontfile.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
/*
@@ -33,6 +33,9 @@ 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 $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/fonts/fntfilst.h>
#ifdef WIN32
#include <ctype.h>
diff --git a/src/fontfile/fontscale.c b/src/fontfile/fontscale.c
index f9c6323..8e9de51 100644
--- a/src/fontfile/fontscale.c
+++ b/src/fontfile/fontscale.c
@@ -31,6 +31,9 @@ in this Software without prior written authorization from The Open Group.
* Author: Keith Packard, MIT X Consortium
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/fonts/fntfilst.h>
#ifdef _XOPEN_SOURCE
#include <math.h>
diff --git a/src/fontfile/gunzip.c b/src/fontfile/gunzip.c
index 9669a8b..8c9c317 100644
--- a/src/fontfile/gunzip.c
+++ b/src/fontfile/gunzip.c
@@ -4,6 +4,9 @@
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 $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/fonts/fontmisc.h>
#include <X11/fonts/bufio.h>
#include <zlib.h>
diff --git a/src/fontfile/printerfont.c b/src/fontfile/printerfont.c
index f91052d..0b6c19c 100644
--- a/src/fontfile/printerfont.c
+++ b/src/fontfile/printerfont.c
@@ -32,6 +32,9 @@ 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 $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/fonts/fntfilst.h>
/*
diff --git a/src/fontfile/register.c b/src/fontfile/register.c
index eaacdc1..dd4a04b 100644
--- a/src/fontfile/register.c
+++ b/src/fontfile/register.c
@@ -33,6 +33,9 @@ in this Software without prior written authorization from The Open Group.
* end up dragging in code from all the renderers, which is not small.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/fonts/fontmisc.h>
#include <X11/fonts/fntfilst.h>
#include <X11/fonts/bitmap.h>
diff --git a/src/fontfile/renderers.c b/src/fontfile/renderers.c
index 4186724..f110ba8 100644
--- a/src/fontfile/renderers.c
+++ b/src/fontfile/renderers.c
@@ -31,6 +31,9 @@ in this Software without prior written authorization from The Open Group.
* Author: Keith Packard, MIT X Consortium
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/fonts/fntfilst.h>
extern void ErrorF(const char *f, ...);
diff --git a/src/stubs/cauthgen.c b/src/stubs/cauthgen.c
index 690416e..dec438d 100644
--- a/src/stubs/cauthgen.c
+++ b/src/stubs/cauthgen.c
@@ -1,5 +1,8 @@
/* $XFree86$ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "stubs.h"
int
diff --git a/src/stubs/csignal.c b/src/stubs/csignal.c
index a2919f7..c957eb8 100644
--- a/src/stubs/csignal.c
+++ b/src/stubs/csignal.c
@@ -1,5 +1,8 @@
/* $XFree86$ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "stubs.h"
Bool
diff --git a/src/stubs/delfntcid.c b/src/stubs/delfntcid.c
index 7e9276a..af5c0a8 100644
--- a/src/stubs/delfntcid.c
+++ b/src/stubs/delfntcid.c
@@ -1,5 +1,8 @@
/* $XFree86$ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "stubs.h"
void
diff --git a/src/stubs/errorf.c b/src/stubs/errorf.c
index f54868d..52c6042 100644
--- a/src/stubs/errorf.c
+++ b/src/stubs/errorf.c
@@ -1,5 +1,8 @@
/* $XFree86: xc/lib/font/stubs/errorf.c,v 1.1 1999/01/11 05:13:19 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "stubs.h"
void
diff --git a/src/stubs/fatalerror.c b/src/stubs/fatalerror.c
index 4b01cbd..7dff170 100644
--- a/src/stubs/fatalerror.c
+++ b/src/stubs/fatalerror.c
@@ -1,5 +1,8 @@
/* $XFree86: xc/lib/font/stubs/fatalerror.c,v 1.1 1999/01/11 05:13:19 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "stubs.h"
void
diff --git a/src/stubs/findoldfnt.c b/src/stubs/findoldfnt.c
index 1b26797..218ecd4 100644
--- a/src/stubs/findoldfnt.c
+++ b/src/stubs/findoldfnt.c
@@ -1,5 +1,8 @@
/* $XFree86$ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "stubs.h"
FontPtr
diff --git a/src/stubs/getcres.c b/src/stubs/getcres.c
index e08ec48..da0de91 100644
--- a/src/stubs/getcres.c
+++ b/src/stubs/getcres.c
@@ -1,5 +1,8 @@
/* $XFree86$ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "stubs.h"
FontResolutionPtr
diff --git a/src/stubs/getdefptsize.c b/src/stubs/getdefptsize.c
index b55a408..10a46c8 100644
--- a/src/stubs/getdefptsize.c
+++ b/src/stubs/getdefptsize.c
@@ -1,5 +1,8 @@
/* $XFree86$ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "stubs.h"
int
diff --git a/src/stubs/getnewfntcid.c b/src/stubs/getnewfntcid.c
index 7253d21..5a1e927 100644
--- a/src/stubs/getnewfntcid.c
+++ b/src/stubs/getnewfntcid.c
@@ -1,5 +1,8 @@
/* $XFree86$ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "stubs.h"
Font
diff --git a/src/stubs/gettime.c b/src/stubs/gettime.c
index c92a980..60a4e39 100644
--- a/src/stubs/gettime.c
+++ b/src/stubs/gettime.c
@@ -1,5 +1,8 @@
/* $XFree86$ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "stubs.h"
unsigned long
diff --git a/src/stubs/initfshdl.c b/src/stubs/initfshdl.c
index e7fffb0..15a337a 100644
--- a/src/stubs/initfshdl.c
+++ b/src/stubs/initfshdl.c
@@ -1,5 +1,8 @@
/* $XFree86: xc/lib/font/stubs/initfshdl.c,v 1.1 1999/01/11 05:13:20 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "stubs.h"
int
diff --git a/src/stubs/regfpefunc.c b/src/stubs/regfpefunc.c
index 0c6741a..d6fcf3b 100644
--- a/src/stubs/regfpefunc.c
+++ b/src/stubs/regfpefunc.c
@@ -1,5 +1,8 @@
/* $XFree86: xc/lib/font/stubs/regfpefunc.c,v 1.1 1999/01/11 05:13:20 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "stubs.h"
int
diff --git a/src/stubs/rmfshdl.c b/src/stubs/rmfshdl.c
index bb50ea1..ae0ab78 100644
--- a/src/stubs/rmfshdl.c
+++ b/src/stubs/rmfshdl.c
@@ -1,5 +1,8 @@
/* $XFree86: xc/lib/font/stubs/rmfshdl.c,v 1.1 1999/01/11 05:13:21 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "stubs.h"
void
diff --git a/src/stubs/setfntauth.c b/src/stubs/setfntauth.c
index b0eb94e..843f155 100644
--- a/src/stubs/setfntauth.c
+++ b/src/stubs/setfntauth.c
@@ -1,5 +1,8 @@
/* $XFree86$ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "stubs.h"
int
diff --git a/src/stubs/stfntcfnt.c b/src/stubs/stfntcfnt.c
index 7cfa12d..c062677 100644
--- a/src/stubs/stfntcfnt.c
+++ b/src/stubs/stfntcfnt.c
@@ -1,5 +1,8 @@
/* $XFree86$ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "stubs.h"
int
diff --git a/src/stubs/xpstubs.c b/src/stubs/xpstubs.c
index 5ac9117..4449153 100644
--- a/src/stubs/xpstubs.c
+++ b/src/stubs/xpstubs.c
@@ -4,6 +4,9 @@
stub for XpClient* functions.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "stubs.h"
Bool
diff --git a/src/util/atom.c b/src/util/atom.c
index 8c7d17f..942ea0d 100644
--- a/src/util/atom.c
+++ b/src/util/atom.c
@@ -33,6 +33,9 @@ in this Software without prior written authorization from The Open Group.
/* lame atom replacement routines for font applications */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/fonts/fontmisc.h>
typedef struct _AtomList {
diff --git a/src/util/fontaccel.c b/src/util/fontaccel.c
index 28d6866..c37f69a 100644
--- a/src/util/fontaccel.c
+++ b/src/util/fontaccel.c
@@ -33,6 +33,9 @@ from The Open Group.
* Author: Keith Packard, MIT X Consortium
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/fonts/fontmisc.h>
#include <X11/fonts/fontstruct.h>
#include <X11/fonts/fontutil.h>
diff --git a/src/util/fontnames.c b/src/util/fontnames.c
index 6be292e..2d3a517 100644
--- a/src/util/fontnames.c
+++ b/src/util/fontnames.c
@@ -35,6 +35,9 @@ from The Open Group.
* @(#)fontnames.c 3.1 91/04/10
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/fonts/fontmisc.h>
#include <X11/fonts/fontstruct.h>
diff --git a/src/util/fontutil.c b/src/util/fontutil.c
index 8440b35..05fe5c2 100644
--- a/src/util/fontutil.c
+++ b/src/util/fontutil.c
@@ -33,6 +33,9 @@ from The Open Group.
* Author: Keith Packard, MIT X Consortium
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/fonts/fontmisc.h>
#include <X11/fonts/fontstruct.h>
#include <X11/fonts/FSproto.h>
diff --git a/src/util/fontxlfd.c b/src/util/fontxlfd.c
index 9ea1ffc..7adf74f 100644
--- a/src/util/fontxlfd.c
+++ b/src/util/fontxlfd.c
@@ -33,6 +33,9 @@ from The Open Group.
* Author: Keith Packard, MIT X Consortium
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/fonts/fontmisc.h>
#include <X11/fonts/fontstruct.h>
#include <X11/fonts/fontxlfd.h>
diff --git a/src/util/format.c b/src/util/format.c
index 89faae8..6700721 100644
--- a/src/util/format.c
+++ b/src/util/format.c
@@ -52,6 +52,9 @@ from The Open Group.
*/
/* $XFree86: xc/lib/font/util/format.c,v 1.4 2001/01/17 19:43:33 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/fonts/FSproto.h>
#include <X11/fonts/font.h>
#include <X11/fonts/fontstruct.h>
diff --git a/src/util/miscutil.c b/src/util/miscutil.c
index 0ee0c3f..03b4d06 100644
--- a/src/util/miscutil.c
+++ b/src/util/miscutil.c
@@ -29,6 +29,9 @@ from The Open Group.
*/
/* $XFree86: xc/lib/font/util/miscutil.c,v 1.7 2001/07/25 15:04:57 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/Xosdefs.h>
#include <stdlib.h>
#include <X11/fonts/fontmisc.h>
diff --git a/src/util/patcache.c b/src/util/patcache.c
index cc81954..0351b1a 100644
--- a/src/util/patcache.c
+++ b/src/util/patcache.c
@@ -31,6 +31,9 @@ in this Software without prior written authorization from The Open Group.
* Author: Keith Packard, MIT X Consortium
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/fonts/fontmisc.h>
#include <X11/fonts/fontstruct.h>
diff --git a/src/util/private.c b/src/util/private.c
index 19d30c4..85e90e5 100644
--- a/src/util/private.c
+++ b/src/util/private.c
@@ -31,6 +31,9 @@ in this Software without prior written authorization from The Open Group.
* Author: Keith Packard, MIT X Consortium
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/fonts/fontmisc.h>
#include <X11/fonts/fontstruct.h>
diff --git a/src/util/utilbitmap.c b/src/util/utilbitmap.c
index a6df83f..a817a4e 100644
--- a/src/util/utilbitmap.c
+++ b/src/util/utilbitmap.c
@@ -31,6 +31,9 @@ in this Software without prior written authorization from The Open Group.
* Author: Keith Packard, MIT X Consortium
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <X11/fonts/fontmisc.h>
/* Utility functions for reformating font bitmaps */