diff options
Diffstat (limited to 'Xprint')
68 files changed, 303 insertions, 31 deletions
diff --git a/Xprint/AttrValid.c b/Xprint/AttrValid.c index 86bfd14e5..b2b018216 100644 --- a/Xprint/AttrValid.c +++ b/Xprint/AttrValid.c @@ -30,6 +30,10 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <scrnintstr.h> #include "attributes.h" diff --git a/Xprint/AttrValid.h b/Xprint/AttrValid.h index 8e27ae01a..440bea06f 100644 --- a/Xprint/AttrValid.h +++ b/Xprint/AttrValid.h @@ -31,6 +31,10 @@ dealings in this Software without prior written authorization from said copyright holders. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _Xp_AttrValid_h #define _Xp_AttrValid_h diff --git a/Xprint/DiPrint.h b/Xprint/DiPrint.h index c1a8dcb45..a26477971 100644 --- a/Xprint/DiPrint.h +++ b/Xprint/DiPrint.h @@ -38,6 +38,10 @@ copyright holders. * request will allow us to build it with the description in the locale of * the requesting client. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _XpDiPrint_H_ #define _XpDiPrint_H_ 1 diff --git a/Xprint/Init.c b/Xprint/Init.c index 44520507c..194e434f3 100644 --- a/Xprint/Init.c +++ b/Xprint/Init.c @@ -52,6 +52,10 @@ copyright holders. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <unistd.h> #include <stdlib.h> #include <stdio.h> diff --git a/Xprint/Oid.c b/Xprint/Oid.c index 575f50582..7f0acaf0b 100644 --- a/Xprint/Oid.c +++ b/Xprint/Oid.c @@ -31,6 +31,10 @@ dealings in this Software without prior written authorization from said copyright holders. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "attributes.h" /* diff --git a/Xprint/Oid.h b/Xprint/Oid.h index 40bf79d07..820cd7563 100644 --- a/Xprint/Oid.h +++ b/Xprint/Oid.h @@ -31,6 +31,10 @@ dealings in this Software without prior written authorization from said copyright holders. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _Xp_Oid_h #define _Xp_Oid_h diff --git a/Xprint/Util.c b/Xprint/Util.c index 595fb6ccf..c1696becf 100644 --- a/Xprint/Util.c +++ b/Xprint/Util.c @@ -33,6 +33,10 @@ copyright holders. /* $XFree86: xc/programs/Xserver/Xprint/Util.c,v 1.12 2001/08/01 00:44:45 tsi Exp $ */ /* To get the tempnam() prototype in <stdio.h> */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #if defined(linux) && defined(__STRICT_ANSI__) #undef __STRICT_ANSI__ #endif diff --git a/Xprint/ValTree.c b/Xprint/ValTree.c index 4b5aba2a8..6fa631617 100644 --- a/Xprint/ValTree.c +++ b/Xprint/ValTree.c @@ -32,6 +32,10 @@ copyright holders. */ /* $XFree86$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "validate.h" diff --git a/Xprint/attributes.c b/Xprint/attributes.c index b015d648d..4e6d63f60 100644 --- a/Xprint/attributes.c +++ b/Xprint/attributes.c @@ -45,6 +45,10 @@ copyright holders. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/Xproto.h> #include <string.h> #include <stdlib.h> diff --git a/Xprint/attributes.h b/Xprint/attributes.h index 52f0fa484..40df4fd0b 100644 --- a/Xprint/attributes.h +++ b/Xprint/attributes.h @@ -31,6 +31,10 @@ dealings in this Software without prior written authorization from said copyright holders. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _Xp_attributes_h #define _Xp_attributes_h 1 diff --git a/Xprint/ddxInit.c b/Xprint/ddxInit.c index 2bbdde3ae..be16a3799 100644 --- a/Xprint/ddxInit.c +++ b/Xprint/ddxInit.c @@ -31,6 +31,10 @@ dealings in this Software without prior written authorization from said copyright holders. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xos.h> #include <X11/Xproto.h> diff --git a/Xprint/mediaSizes.c b/Xprint/mediaSizes.c index 8bbd8b381..aedf32f1f 100644 --- a/Xprint/mediaSizes.c +++ b/Xprint/mediaSizes.c @@ -48,6 +48,10 @@ copyright holders. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <unistd.h> #include <stdlib.h> #include <stdio.h> @@ -60,7 +64,7 @@ copyright holders. #include "screenint.h" #include <X11/misc.h> #include "scrnintstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "DiPrint.h" #include "attributes.h" diff --git a/Xprint/pcl/Pcl.h b/Xprint/pcl/Pcl.h index 92621d232..59656be1a 100644 --- a/Xprint/pcl/Pcl.h +++ b/Xprint/pcl/Pcl.h @@ -46,6 +46,10 @@ copyright holders. */ /* $XFree86: xc/programs/Xserver/Xprint/pcl/Pcl.h,v 1.12 2001/12/21 21:02:05 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _PCL_H_ #define _PCL_H_ @@ -60,7 +64,7 @@ copyright holders. #include <X11/extensions/Printstr.h> #include "regionstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" diff --git a/Xprint/pcl/PclArc.c b/Xprint/pcl/PclArc.c index af32eb619..d675e1699 100644 --- a/Xprint/pcl/PclArc.c +++ b/Xprint/pcl/PclArc.c @@ -47,6 +47,10 @@ copyright holders. /* $XFree86: xc/programs/Xserver/Xprint/pcl/PclArc.c,v 1.4 1999/12/13 02:12:53 robin Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <math.h> #include <errno.h> diff --git a/Xprint/pcl/PclArea.c b/Xprint/pcl/PclArea.c index 00e6aff04..cfed7c866 100644 --- a/Xprint/pcl/PclArea.c +++ b/Xprint/pcl/PclArea.c @@ -46,6 +46,10 @@ copyright holders. */ /* $XFree86: xc/programs/Xserver/Xprint/pcl/PclArea.c,v 1.8 2001/01/17 22:36:30 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <sys/types.h> #include <sys/stat.h> diff --git a/Xprint/pcl/PclAttVal.c b/Xprint/pcl/PclAttVal.c index 88fcf23b5..adbd197fd 100644 --- a/Xprint/pcl/PclAttVal.c +++ b/Xprint/pcl/PclAttVal.c @@ -33,6 +33,10 @@ dealings in this Software without prior written authorization from said copyright holders. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "Pcl.h" #include "AttrValid.h" diff --git a/Xprint/pcl/PclAttr.c b/Xprint/pcl/PclAttr.c index 2612a821f..3cde053f1 100644 --- a/Xprint/pcl/PclAttr.c +++ b/Xprint/pcl/PclAttr.c @@ -45,6 +45,10 @@ dealings in this Software without prior written authorization from said copyright holders. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "Pcl.h" #include "attributes.h" diff --git a/Xprint/pcl/PclColor.c b/Xprint/pcl/PclColor.c index d5d2e022b..72c7e3f99 100644 --- a/Xprint/pcl/PclColor.c +++ b/Xprint/pcl/PclColor.c @@ -47,6 +47,10 @@ copyright holders. */ /* $XFree86: xc/programs/Xserver/Xprint/pcl/PclColor.c,v 1.9tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <string.h> #include <stdlib.h> diff --git a/Xprint/pcl/PclCursor.c b/Xprint/pcl/PclCursor.c index e7288c9ec..f50c355e9 100644 --- a/Xprint/pcl/PclCursor.c +++ b/Xprint/pcl/PclCursor.c @@ -46,6 +46,10 @@ copyright holders. */ /* $XFree86: xc/programs/Xserver/Xprint/pcl/PclCursor.c,v 1.3 1999/12/16 02:26:27 robin Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include "Pcl.h" diff --git a/Xprint/pcl/PclDef.h b/Xprint/pcl/PclDef.h index 2638748b2..275bd63ec 100644 --- a/Xprint/pcl/PclDef.h +++ b/Xprint/pcl/PclDef.h @@ -45,6 +45,10 @@ dealings in this Software without prior written authorization from said copyright holders. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _PCLDEF_H_ #define _PCLDEF_H_ diff --git a/Xprint/pcl/PclFonts.c b/Xprint/pcl/PclFonts.c index d5eff48c7..591435faa 100644 --- a/Xprint/pcl/PclFonts.c +++ b/Xprint/pcl/PclFonts.c @@ -46,8 +46,12 @@ dealings in this Software without prior written authorization from said copyright holders. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "regionstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "scrnintstr.h" diff --git a/Xprint/pcl/PclGC.c b/Xprint/pcl/PclGC.c index 67331a454..83ebb47e1 100644 --- a/Xprint/pcl/PclGC.c +++ b/Xprint/pcl/PclGC.c @@ -46,6 +46,10 @@ copyright holders. */ /* $XFree86: xc/programs/Xserver/Xprint/pcl/PclGC.c,v 1.9 2001/01/19 18:34:28 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "gcstruct.h" #include "Pcl.h" diff --git a/Xprint/pcl/PclInit.c b/Xprint/pcl/PclInit.c index 3d0a731ac..8bedee7c3 100644 --- a/Xprint/pcl/PclInit.c +++ b/Xprint/pcl/PclInit.c @@ -78,6 +78,10 @@ copyright holders. */ /* $XFree86: xc/programs/Xserver/Xprint/pcl/PclInit.c,v 1.11 2001/12/21 21:02:05 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <string.h> #include <sys/types.h> diff --git a/Xprint/pcl/PclLine.c b/Xprint/pcl/PclLine.c index aa72e8ff0..f2b564df8 100644 --- a/Xprint/pcl/PclLine.c +++ b/Xprint/pcl/PclLine.c @@ -46,6 +46,10 @@ copyright holders. */ /* $XFree86: xc/programs/Xserver/Xprint/pcl/PclLine.c,v 1.6 1999/12/13 02:12:55 robin Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "Pcl.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/Xprint/pcl/PclMisc.c b/Xprint/pcl/PclMisc.c index 9405a4e78..3a958e783 100644 --- a/Xprint/pcl/PclMisc.c +++ b/Xprint/pcl/PclMisc.c @@ -46,6 +46,10 @@ copyright holders. */ /* $XFree86: xc/programs/Xserver/Xprint/pcl/PclMisc.c,v 1.10tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdlib.h> #include <signal.h> #include <sys/types.h> diff --git a/Xprint/pcl/PclPixel.c b/Xprint/pcl/PclPixel.c index 372a54e9f..bfad618ed 100644 --- a/Xprint/pcl/PclPixel.c +++ b/Xprint/pcl/PclPixel.c @@ -46,6 +46,10 @@ copyright holders. */ /* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPixel.c,v 1.6tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include "windowstr.h" diff --git a/Xprint/pcl/PclPixmap.c b/Xprint/pcl/PclPixmap.c index 178289bc1..9449dfdd6 100644 --- a/Xprint/pcl/PclPixmap.c +++ b/Xprint/pcl/PclPixmap.c @@ -46,6 +46,10 @@ copyright holders. */ /* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPixmap.c,v 1.3 1999/12/16 02:26:27 robin Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "Pcl.h" #include "cfb.h" #include "cfb32.h" diff --git a/Xprint/pcl/PclPolygon.c b/Xprint/pcl/PclPolygon.c index ddfd9ef8a..41ba4b1c0 100644 --- a/Xprint/pcl/PclPolygon.c +++ b/Xprint/pcl/PclPolygon.c @@ -47,6 +47,10 @@ copyright holders. /* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPolygon.c,v 1.6 1999/12/13 02:12:56 robin Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "Pcl.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/Xprint/pcl/PclPrint.c b/Xprint/pcl/PclPrint.c index 663086266..701710253 100644 --- a/Xprint/pcl/PclPrint.c +++ b/Xprint/pcl/PclPrint.c @@ -45,6 +45,10 @@ copyright holders. */ /* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPrint.c,v 1.7tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <string.h> #include <sys/types.h> diff --git a/Xprint/pcl/PclSFonts.c b/Xprint/pcl/PclSFonts.c index 121ed0077..287c5c14f 100644 --- a/Xprint/pcl/PclSFonts.c +++ b/Xprint/pcl/PclSFonts.c @@ -48,6 +48,10 @@ copyright holders. /* $XFree86: xc/programs/Xserver/Xprint/pcl/PclSFonts.c,v 1.7tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include "Pcl.h" diff --git a/Xprint/pcl/PclSFonts.h b/Xprint/pcl/PclSFonts.h index 5992c12af..fdd62f651 100644 --- a/Xprint/pcl/PclSFonts.h +++ b/Xprint/pcl/PclSFonts.h @@ -1,4 +1,8 @@ /* $Xorg: PclSFonts.h,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _PCLFONTS_H #define _PCLFONTS_H diff --git a/Xprint/pcl/PclSpans.c b/Xprint/pcl/PclSpans.c index 92261c977..51c0137fc 100644 --- a/Xprint/pcl/PclSpans.c +++ b/Xprint/pcl/PclSpans.c @@ -47,6 +47,10 @@ copyright holders. /* $XFree86: xc/programs/Xserver/Xprint/pcl/PclSpans.c,v 1.5 1999/12/13 02:12:57 robin Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "Pcl.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/Xprint/pcl/PclText.c b/Xprint/pcl/PclText.c index a7f37be56..be794772c 100644 --- a/Xprint/pcl/PclText.c +++ b/Xprint/pcl/PclText.c @@ -46,6 +46,10 @@ copyright holders. */ /* $XFree86: xc/programs/Xserver/Xprint/pcl/PclText.c,v 1.10tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef DO_TWO_BYTE_PCL #include "iconv.h" #endif /* DO_TWO_BYTE_PCL */ diff --git a/Xprint/pcl/PclWindow.c b/Xprint/pcl/PclWindow.c index 42a6f6234..cac5826e9 100644 --- a/Xprint/pcl/PclWindow.c +++ b/Xprint/pcl/PclWindow.c @@ -47,6 +47,10 @@ copyright holders. /* $XFree86: xc/programs/Xserver/Xprint/pcl/PclWindow.c,v 1.10tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <string.h> #include <sys/types.h> diff --git a/Xprint/pcl/Pclmap.h b/Xprint/pcl/Pclmap.h index 1a68faf1e..5224fd9e3 100644 --- a/Xprint/pcl/Pclmap.h +++ b/Xprint/pcl/Pclmap.h @@ -32,6 +32,10 @@ copyright holders. */ /* $XFree86: xc/programs/Xserver/Xprint/pcl/Pclmap.h,v 1.5 2001/07/25 15:05:00 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _PCLMAP_H_ #define _PCLMAP_H_ diff --git a/Xprint/ps/Ps.h b/Xprint/ps/Ps.h index 8c47fc9e5..32a2b5346 100644 --- a/Xprint/ps/Ps.h +++ b/Xprint/ps/Ps.h @@ -75,6 +75,10 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _PS_H_ #define _PS_H_ @@ -94,7 +98,7 @@ in this Software without prior written authorization from The Open Group. #include <X11/extensions/Printstr.h> #include "regionstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" diff --git a/Xprint/ps/PsArc.c b/Xprint/ps/PsArc.c index 76804bb18..511971e7a 100644 --- a/Xprint/ps/PsArc.c +++ b/Xprint/ps/PsArc.c @@ -74,6 +74,10 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include "Ps.h" diff --git a/Xprint/ps/PsArea.c b/Xprint/ps/PsArea.c index 7850da0f8..32a4d5cf4 100644 --- a/Xprint/ps/PsArea.c +++ b/Xprint/ps/PsArea.c @@ -74,6 +74,10 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "Ps.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/Xprint/ps/PsAttVal.c b/Xprint/ps/PsAttVal.c index 5ebd0d3b9..fc23ffef5 100644 --- a/Xprint/ps/PsAttVal.c +++ b/Xprint/ps/PsAttVal.c @@ -33,6 +33,10 @@ dealings in this Software without prior written authorization from said copyright holders. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "Ps.h" #include "AttrValid.h" diff --git a/Xprint/ps/PsAttr.c b/Xprint/ps/PsAttr.c index 8a5bee9e3..74da5a0e1 100644 --- a/Xprint/ps/PsAttr.c +++ b/Xprint/ps/PsAttr.c @@ -74,6 +74,10 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "Ps.h" #include "attributes.h" diff --git a/Xprint/ps/PsCache.c b/Xprint/ps/PsCache.c index 8c9f4a926..e69aa2eb7 100644 --- a/Xprint/ps/PsCache.c +++ b/Xprint/ps/PsCache.c @@ -73,11 +73,15 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "Ps.h" #include "gcstruct.h" #include "windowstr.h" -#include "fntfil.h" -#include "fntfilst.h" +#include <X11/fonts/fntfil.h> +#include <X11/fonts/fntfilst.h> #define GET 0 #define RESET 1 diff --git a/Xprint/ps/PsColor.c b/Xprint/ps/PsColor.c index 3586a77b8..91a44f85a 100644 --- a/Xprint/ps/PsColor.c +++ b/Xprint/ps/PsColor.c @@ -74,6 +74,10 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "Ps.h" #include "mi.h" #include "micmap.h" diff --git a/Xprint/ps/PsDef.h b/Xprint/ps/PsDef.h index ec648c442..cf45c8516 100644 --- a/Xprint/ps/PsDef.h +++ b/Xprint/ps/PsDef.h @@ -74,6 +74,10 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _PSDEF_H_ #define _PSDEF_H_ diff --git a/Xprint/ps/PsFTFonts.c b/Xprint/ps/PsFTFonts.c index cfdee93d1..2fbff1a1c 100644 --- a/Xprint/ps/PsFTFonts.c +++ b/Xprint/ps/PsFTFonts.c @@ -21,17 +21,21 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <ctype.h> #include <limits.h> #include <sys/stat.h> #include "regionstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "scrnintstr.h" -#include "fontxlfd.h" -#include "fntfil.h" -#include "fntfilst.h" +#include <X11/fonts/fontxlfd.h> +#include <X11/fonts/fntfil.h> +#include <X11/fonts/fntfilst.h> #include "Ps.h" diff --git a/Xprint/ps/PsFonts.c b/Xprint/ps/PsFonts.c index 6d0ba1a61..10c0b1a5b 100644 --- a/Xprint/ps/PsFonts.c +++ b/Xprint/ps/PsFonts.c @@ -74,13 +74,17 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "regionstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "scrnintstr.h" -#include "fontxlfd.h" -#include "fntfil.h" -#include "fntfilst.h" +#include <X11/fonts/fontxlfd.h> +#include <X11/fonts/fntfil.h> +#include <X11/fonts/fntfilst.h> #include "Ps.h" diff --git a/Xprint/ps/PsGC.c b/Xprint/ps/PsGC.c index c4984d075..56ff5cdae 100644 --- a/Xprint/ps/PsGC.c +++ b/Xprint/ps/PsGC.c @@ -74,6 +74,10 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "Ps.h" #include "gcstruct.h" #include "pixmapstr.h" diff --git a/Xprint/ps/PsImageUtil.c b/Xprint/ps/PsImageUtil.c index c32cb54bb..282786564 100644 --- a/Xprint/ps/PsImageUtil.c +++ b/Xprint/ps/PsImageUtil.c @@ -29,6 +29,10 @@ copyright holders. /* Please do not beat me for this ugly code - most of it has been stolen from * xc/lib/X11/ImUtil.c */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "gcstruct.h" #include "windowstr.h" #include "servermd.h" diff --git a/Xprint/ps/PsInit.c b/Xprint/ps/PsInit.c index 2abaf90b3..a11a61ae4 100644 --- a/Xprint/ps/PsInit.c +++ b/Xprint/ps/PsInit.c @@ -74,6 +74,10 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <string.h> #include <unistd.h> diff --git a/Xprint/ps/PsLine.c b/Xprint/ps/PsLine.c index 23e105804..2524769c8 100644 --- a/Xprint/ps/PsLine.c +++ b/Xprint/ps/PsLine.c @@ -74,6 +74,10 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "Ps.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/Xprint/ps/PsMisc.c b/Xprint/ps/PsMisc.c index a4c585f0d..b8a3ba854 100644 --- a/Xprint/ps/PsMisc.c +++ b/Xprint/ps/PsMisc.c @@ -74,6 +74,10 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/Xos.h> /* for SIGCLD on pre-POSIX systems */ #include <stdio.h> #include "Ps.h" diff --git a/Xprint/ps/PsPixel.c b/Xprint/ps/PsPixel.c index c2c360d2e..2197f0ab9 100644 --- a/Xprint/ps/PsPixel.c +++ b/Xprint/ps/PsPixel.c @@ -74,6 +74,10 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include "windowstr.h" diff --git a/Xprint/ps/PsPixmap.c b/Xprint/ps/PsPixmap.c index 25a525b82..a698b375e 100644 --- a/Xprint/ps/PsPixmap.c +++ b/Xprint/ps/PsPixmap.c @@ -74,6 +74,10 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "windowstr.h" #include "gcstruct.h" diff --git a/Xprint/ps/PsPolygon.c b/Xprint/ps/PsPolygon.c index dca00fa21..a1ae67f8d 100644 --- a/Xprint/ps/PsPolygon.c +++ b/Xprint/ps/PsPolygon.c @@ -74,6 +74,10 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "Ps.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/Xprint/ps/PsPrint.c b/Xprint/ps/PsPrint.c index 721e430ae..05e8e2588 100644 --- a/Xprint/ps/PsPrint.c +++ b/Xprint/ps/PsPrint.c @@ -74,6 +74,10 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <string.h> #include <sys/types.h> diff --git a/Xprint/ps/PsSpans.c b/Xprint/ps/PsSpans.c index a7370866e..d7652f8fb 100644 --- a/Xprint/ps/PsSpans.c +++ b/Xprint/ps/PsSpans.c @@ -75,6 +75,10 @@ in this Software without prior written authorization from The Open Group. ********************************************************************/ /* $XFree86: xc/programs/Xserver/Xprint/ps/PsSpans.c,v 1.8 2001/10/28 03:32:56 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "Ps.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/Xprint/ps/PsText.c b/Xprint/ps/PsText.c index 8bb0b0fb2..228e407dc 100644 --- a/Xprint/ps/PsText.c +++ b/Xprint/ps/PsText.c @@ -74,11 +74,15 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "Ps.h" #include "gcstruct.h" #include "windowstr.h" -#include "fntfil.h" -#include "fntfilst.h" +#include <X11/fonts/fntfil.h> +#include <X11/fonts/fntfilst.h> #include <limits.h> int diff --git a/Xprint/ps/PsWindow.c b/Xprint/ps/PsWindow.c index 3a9a7ed2a..313e51f31 100644 --- a/Xprint/ps/PsWindow.c +++ b/Xprint/ps/PsWindow.c @@ -74,6 +74,10 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <string.h> #include <sys/wait.h> diff --git a/Xprint/ps/psout.c b/Xprint/ps/psout.c index 66764401c..ffaf863ed 100644 --- a/Xprint/ps/psout.c +++ b/Xprint/ps/psout.c @@ -74,6 +74,10 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdlib.h> #include <stdio.h> #include <X11/os.h> diff --git a/Xprint/ps/psout.h b/Xprint/ps/psout.h index d60717b55..8441d8d07 100644 --- a/Xprint/ps/psout.h +++ b/Xprint/ps/psout.h @@ -74,6 +74,10 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _psout_ #define _psout_ diff --git a/Xprint/ps/psout_ft.c b/Xprint/ps/psout_ft.c index 938c8b1ae..fbb7e3ec4 100644 --- a/Xprint/ps/psout_ft.c +++ b/Xprint/ps/psout_ft.c @@ -21,6 +21,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdlib.h> #include <stdio.h> #include <X11/os.h> @@ -32,11 +36,11 @@ THE SOFTWARE. #include FT_TYPE1_TABLES_H #include <X11/Xproto.h> -#include "font.h" -#include "fontstruct.h" -#include "fntfilst.h" -#include "fontutil.h" -#include "fontenc.h" +#include <X11/fonts/font.h> +#include <X11/fonts/fontstruct.h> +#include <X11/fonts/fntfilst.h> +#include <X11/fonts/fontutil.h> +#include <X11/fonts/fontenc.h> #include "ft.h" #include "ftfuncs.h" #include "servermd.h" /* needed for endian test (IMAGE_BYTE_ORDER) */ diff --git a/Xprint/ps/psout_ftpstype1.c b/Xprint/ps/psout_ftpstype1.c index 2e77653d2..6860eaf2a 100644 --- a/Xprint/ps/psout_ftpstype1.c +++ b/Xprint/ps/psout_ftpstype1.c @@ -22,6 +22,10 @@ THE SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdlib.h> #include <stdio.h> #include <errno.h> @@ -35,11 +39,11 @@ THE SOFTWARE. #include FT_FREETYPE_H #include <X11/Xproto.h> -#include "font.h" -#include "fontstruct.h" -#include "fntfilst.h" -#include "fontutil.h" -#include "fontenc.h" +#include <X11/fonts/font.h> +#include <X11/fonts/fontstruct.h> +#include <X11/fonts/fntfilst.h> +#include <X11/fonts/fontutil.h> +#include <X11/fonts/fontenc.h> #include "ft.h" #include "ftfuncs.h" diff --git a/Xprint/ps/psout_ftpstype3.c b/Xprint/ps/psout_ftpstype3.c index 82c5e5f05..1d9b00c7c 100644 --- a/Xprint/ps/psout_ftpstype3.c +++ b/Xprint/ps/psout_ftpstype3.c @@ -21,6 +21,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdlib.h> #include <stdio.h> #include <X11/os.h> @@ -59,11 +63,11 @@ THE SOFTWARE. #endif /* USE_FT_INTERNALS */ #include <X11/Xproto.h> -#include "font.h" -#include "fontstruct.h" -#include "fntfilst.h" -#include "fontutil.h" -#include "fontenc.h" +#include <X11/fonts/font.h> +#include <X11/fonts/fontstruct.h> +#include <X11/fonts/fntfilst.h> +#include <X11/fonts/fontutil.h> +#include <X11/fonts/fontenc.h> #include "ft.h" #include "ftfuncs.h" diff --git a/Xprint/ps/ttf2pt1wrap.c b/Xprint/ps/ttf2pt1wrap.c index bd5ef526e..57bb777d2 100644 --- a/Xprint/ps/ttf2pt1wrap.c +++ b/Xprint/ps/ttf2pt1wrap.c @@ -2,6 +2,10 @@ * Wrapper to add missing symbol to externally supplied code */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef Lynx extern int optind; extern char *optarg; diff --git a/Xprint/raster/Raster.c b/Xprint/raster/Raster.c index 5c69d44d2..3651c3f5d 100644 --- a/Xprint/raster/Raster.c +++ b/Xprint/raster/Raster.c @@ -48,6 +48,10 @@ copyright holders. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <errno.h> #include <stdio.h> #include <string.h> diff --git a/Xprint/raster/Raster.h b/Xprint/raster/Raster.h index af6f3fa1f..d4dbc22d4 100644 --- a/Xprint/raster/Raster.h +++ b/Xprint/raster/Raster.h @@ -44,6 +44,10 @@ copyright holders. ** ********************************************************* ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _RASTER_H_ #define _RASTER_H_ diff --git a/Xprint/raster/RasterAttVal.c b/Xprint/raster/RasterAttVal.c index 811ac65ca..3bba176d1 100644 --- a/Xprint/raster/RasterAttVal.c +++ b/Xprint/raster/RasterAttVal.c @@ -32,6 +32,10 @@ copyright holders. */ /* $XFree86: xc/programs/Xserver/Xprint/raster/RasterAttVal.c,v 1.3 2001/10/31 22:50:29 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <X11/X.h> #include <X11/misc.h> diff --git a/Xprint/spooler.c b/Xprint/spooler.c index 8367a8438..f709c57ab 100644 --- a/Xprint/spooler.c +++ b/Xprint/spooler.c @@ -27,6 +27,10 @@ dealings in this Software without prior written authorization from said copyright holders. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <unistd.h> #include <stdlib.h> #include <stdio.h> diff --git a/Xprint/spooler.h b/Xprint/spooler.h index ac1257c55..4e9b4aefc 100644 --- a/Xprint/spooler.h +++ b/Xprint/spooler.h @@ -1,4 +1,8 @@ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef SPOOLER_H #define SPOOLER_H 1 |