diff options
Diffstat (limited to 'hw/xprint')
69 files changed, 17 insertions, 104 deletions
diff --git a/hw/xprint/AttrValid.c b/hw/xprint/AttrValid.c index cf9476003..f8c292faa 100644 --- a/hw/xprint/AttrValid.c +++ b/hw/xprint/AttrValid.c @@ -1,4 +1,3 @@ -/* $Xorg: AttrValid.c,v 1.4 2001/03/14 18:43:17 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/AttrValid.h b/hw/xprint/AttrValid.h index fab3a7f5e..7bb7ce1c8 100644 --- a/hw/xprint/AttrValid.h +++ b/hw/xprint/AttrValid.h @@ -1,4 +1,3 @@ -/* $Xorg: AttrValid.h,v 1.4 2001/03/14 18:43:40 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/DiPrint.h b/hw/xprint/DiPrint.h index 6801ce046..22cbf0d43 100644 --- a/hw/xprint/DiPrint.h +++ b/hw/xprint/DiPrint.h @@ -1,4 +1,3 @@ -/* $Xorg: DiPrint.h,v 1.3 2000/08/17 19:48:04 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/Init.c b/hw/xprint/Init.c index 0f1be6791..69100d390 100644 --- a/hw/xprint/Init.c +++ b/hw/xprint/Init.c @@ -1,4 +1,3 @@ -/* $Xorg: Init.c,v 1.5 2001/03/07 17:31:33 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/Makefile.am b/hw/xprint/Makefile.am index 46647a519..27a7e30d1 100644 --- a/hw/xprint/Makefile.am +++ b/hw/xprint/Makefile.am @@ -2,9 +2,9 @@ SUBDIRS = doc pcl pcl-mono raster ps etc config bin_PROGRAMS = Xprt -Xprt_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \ +Xprt_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAGS@ \ -DXPRINT -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_ \ - -DXPRINTDIR=\"$(prefix)/X11/xserver\" \ + -DXPRINTDIR=\"$(libdir)/X11/xserver\" \ -DXPRASTERDDX -DXPPCLDDX -DXPMONOPCLDDX -DXPPSDDX Xprt_LDFLAGS = -L$(top_srcdir) diff --git a/hw/xprint/Oid.c b/hw/xprint/Oid.c index e4dadd519..a2af00108 100644 --- a/hw/xprint/Oid.c +++ b/hw/xprint/Oid.c @@ -1,4 +1,3 @@ -/* $Xorg: Oid.c,v 1.3 2000/08/17 19:48:06 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/Oid.h b/hw/xprint/Oid.h index fc9f12a5b..79e85ec64 100644 --- a/hw/xprint/Oid.h +++ b/hw/xprint/Oid.h @@ -1,4 +1,3 @@ -/* $Xorg: Oid.h,v 1.3 2000/08/17 19:48:06 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/OidDefs.h b/hw/xprint/OidDefs.h index 55b6568f0..a3b37eaaf 100644 --- a/hw/xprint/OidDefs.h +++ b/hw/xprint/OidDefs.h @@ -1,4 +1,3 @@ -/* $Xorg: OidDefs.h,v 1.4 2001/03/14 18:45:13 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/OidStrs.h b/hw/xprint/OidStrs.h index 1792a6e16..5ed2089e0 100644 --- a/hw/xprint/OidStrs.h +++ b/hw/xprint/OidStrs.h @@ -1,4 +1,3 @@ -/* $Xorg: OidStrs.h,v 1.4 2001/03/14 18:45:40 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/Util.c b/hw/xprint/Util.c index 12a2562a4..eb7f839c9 100644 --- a/hw/xprint/Util.c +++ b/hw/xprint/Util.c @@ -1,4 +1,3 @@ -/* $Xorg: Util.c,v 1.3 2000/08/17 19:48:06 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. @@ -30,7 +29,6 @@ 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. */ -/* $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 diff --git a/hw/xprint/ValTree.c b/hw/xprint/ValTree.c index 6fa631617..60e340dc1 100644 --- a/hw/xprint/ValTree.c +++ b/hw/xprint/ValTree.c @@ -1,4 +1,3 @@ -/* $Xorg: ValTree.c,v 1.3 2000/08/17 19:48:06 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/attributes.c b/hw/xprint/attributes.c index 8e4c811cb..a24c1076b 100644 --- a/hw/xprint/attributes.c +++ b/hw/xprint/attributes.c @@ -1,4 +1,3 @@ -/* $Xorg: attributes.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/attributes.h b/hw/xprint/attributes.h index 40df4fd0b..26864a2f0 100644 --- a/hw/xprint/attributes.h +++ b/hw/xprint/attributes.h @@ -1,4 +1,3 @@ -/* $Xorg: attributes.h,v 1.4 2001/03/14 18:42:44 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am b/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am index 7cdfd8ee9..e7ddb6c0f 100644 --- a/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am +++ b/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am @@ -17,7 +17,6 @@ dist_xpc_DATA = \ LubalinGraph-Book.pmf \ LubalinGraph-DemiOblique.pmf \ LubalinGraph-Demi.pmf \ - NewCenturySchlbk-BoldItalic.pmf \ NewCenturySchlbk-Bold.pmf \ NewCenturySchlbk-Italic.pmf \ NewCenturySchlbk-Roman.pmf \ diff --git a/hw/xprint/ddxInit.c b/hw/xprint/ddxInit.c index d4c0b9a4c..6cd3cfd3c 100644 --- a/hw/xprint/ddxInit.c +++ b/hw/xprint/ddxInit.c @@ -1,4 +1,3 @@ -/* $Xorg: ddxInit.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. @@ -245,17 +244,6 @@ ddxBeforeReset(void) } #endif -#ifdef DDXTIME -CARD32 -GetTimeInMillis(void) -{ - struct timeval tp; - - X_GETTIMEOFDAY(&tp); - return(tp.tv_sec * 1000) + (tp.tv_usec / 1000); -} -#endif - /* ddxInitGlobals - called by |InitGlobals| from os/util.c */ void ddxInitGlobals(void) { diff --git a/hw/xprint/etc/init.d/Makefile.am b/hw/xprint/etc/init.d/Makefile.am index cc03cfab4..0cf1adc92 100644 --- a/hw/xprint/etc/init.d/Makefile.am +++ b/hw/xprint/etc/init.d/Makefile.am @@ -1 +1,12 @@ +include $(top_srcdir)/cpprules.in + +noinst_PRE = xprint +BUILT_SOURCES = $(noinst_PRE) +CLEANFILES = $(noinst_PRE) xprint.pre + +CPP_FILES_FLAGS = -DProjectRoot='"$(PROJECTROOT)"' -DOS_LINUX + +xprint.pre: xprint.cpp + $(SED) -e 's/^\(\s\+\)#/\1XCOMM/' ${srcdir}/xprint.cpp > $@ + EXTRA_DIST = xprint.cpp diff --git a/hw/xprint/mediaSizes.c b/hw/xprint/mediaSizes.c index 7f582199d..7acc70679 100644 --- a/hw/xprint/mediaSizes.c +++ b/hw/xprint/mediaSizes.c @@ -1,4 +1,3 @@ -/* $Xorg: mediaSizes.c,v 1.4 2001/03/14 18:44:37 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/pcl/Makefile.am.inc b/hw/xprint/pcl/Makefile.am.inc index 38a784e13..c3af606ee 100644 --- a/hw/xprint/pcl/Makefile.am.inc +++ b/hw/xprint/pcl/Makefile.am.inc @@ -1,7 +1,6 @@ INCLUDES = -I$(top_srcdir)/hw/xprint -AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \ - -D_XP_PRINT_SERVER_ -DPSZ=8 $(PCL_DRIVER) +AM_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAGS@ -D_XP_PRINT_SERVER_ $(PCL_DRIVER) libpcl_la_SOURCES = \ $(srcdir)/../pcl/PclArc.c \ diff --git a/hw/xprint/pcl/Pcl.h b/hw/xprint/pcl/Pcl.h index bb1f52b2c..217e30438 100644 --- a/hw/xprint/pcl/Pcl.h +++ b/hw/xprint/pcl/Pcl.h @@ -1,4 +1,3 @@ -/* $Xorg: Pcl.h,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,6 @@ 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. */ -/* $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> diff --git a/hw/xprint/pcl/PclArc.c b/hw/xprint/pcl/PclArc.c index d675e1699..0d8289e33 100644 --- a/hw/xprint/pcl/PclArc.c +++ b/hw/xprint/pcl/PclArc.c @@ -1,4 +1,3 @@ -/* $Xorg: PclArc.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -45,7 +44,6 @@ dealings in this Software without prior written authorization from said 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> diff --git a/hw/xprint/pcl/PclArea.c b/hw/xprint/pcl/PclArea.c index dc9156b17..59ae5e3cc 100644 --- a/hw/xprint/pcl/PclArea.c +++ b/hw/xprint/pcl/PclArea.c @@ -1,4 +1,3 @@ -/* $Xorg: PclArea.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,6 @@ 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. */ -/* $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> diff --git a/hw/xprint/pcl/PclAttVal.c b/hw/xprint/pcl/PclAttVal.c index adbd197fd..f0f204764 100644 --- a/hw/xprint/pcl/PclAttVal.c +++ b/hw/xprint/pcl/PclAttVal.c @@ -1,5 +1,4 @@ /* - * $Xorg: PclAttVal.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company diff --git a/hw/xprint/pcl/PclAttr.c b/hw/xprint/pcl/PclAttr.c index 3cde053f1..b27bf4fce 100644 --- a/hw/xprint/pcl/PclAttr.c +++ b/hw/xprint/pcl/PclAttr.c @@ -1,4 +1,3 @@ -/* $Xorg: PclAttr.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* diff --git a/hw/xprint/pcl/PclColor.c b/hw/xprint/pcl/PclColor.c index 37d42a521..8b05da056 100644 --- a/hw/xprint/pcl/PclColor.c +++ b/hw/xprint/pcl/PclColor.c @@ -1,4 +1,3 @@ -/* $Xorg: PclColor.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -45,7 +44,6 @@ 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. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclColor.c,v 1.9tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/hw/xprint/pcl/PclCursor.c b/hw/xprint/pcl/PclCursor.c index f50c355e9..a3eeb1610 100644 --- a/hw/xprint/pcl/PclCursor.c +++ b/hw/xprint/pcl/PclCursor.c @@ -1,4 +1,3 @@ -/* $Xorg: PclCursor.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,6 @@ 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. */ -/* $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> diff --git a/hw/xprint/pcl/PclDef.h b/hw/xprint/pcl/PclDef.h index 275bd63ec..dcd54c4fe 100644 --- a/hw/xprint/pcl/PclDef.h +++ b/hw/xprint/pcl/PclDef.h @@ -1,4 +1,3 @@ -/* $Xorg: PclDef.h,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* diff --git a/hw/xprint/pcl/PclFonts.c b/hw/xprint/pcl/PclFonts.c index 591435faa..716c48d6d 100644 --- a/hw/xprint/pcl/PclFonts.c +++ b/hw/xprint/pcl/PclFonts.c @@ -1,4 +1,3 @@ -/* $Xorg: PclFonts.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* diff --git a/hw/xprint/pcl/PclGC.c b/hw/xprint/pcl/PclGC.c index c47986eed..ba82c566a 100644 --- a/hw/xprint/pcl/PclGC.c +++ b/hw/xprint/pcl/PclGC.c @@ -1,4 +1,3 @@ -/* $Xorg: PclGC.c,v 1.4 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,6 @@ 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. */ -/* $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> diff --git a/hw/xprint/pcl/PclInit.c b/hw/xprint/pcl/PclInit.c index 272f4da9a..734ec5f27 100644 --- a/hw/xprint/pcl/PclInit.c +++ b/hw/xprint/pcl/PclInit.c @@ -1,4 +1,3 @@ -/* $Xorg: PclInit.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -76,7 +75,6 @@ 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. */ -/* $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> diff --git a/hw/xprint/pcl/PclLine.c b/hw/xprint/pcl/PclLine.c index f2b564df8..52a586d17 100644 --- a/hw/xprint/pcl/PclLine.c +++ b/hw/xprint/pcl/PclLine.c @@ -1,4 +1,3 @@ -/* $Xorg: PclLine.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,6 @@ 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. */ -/* $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> diff --git a/hw/xprint/pcl/PclMisc.c b/hw/xprint/pcl/PclMisc.c index 3a958e783..e0b7dced9 100644 --- a/hw/xprint/pcl/PclMisc.c +++ b/hw/xprint/pcl/PclMisc.c @@ -1,4 +1,3 @@ -/* $Xorg: PclMisc.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,6 @@ 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. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclMisc.c,v 1.10tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/hw/xprint/pcl/PclPixel.c b/hw/xprint/pcl/PclPixel.c index bfad618ed..f41af272f 100644 --- a/hw/xprint/pcl/PclPixel.c +++ b/hw/xprint/pcl/PclPixel.c @@ -1,4 +1,3 @@ -/* $Xorg: PclPixel.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,6 @@ 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. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPixel.c,v 1.6tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/hw/xprint/pcl/PclPolygon.c b/hw/xprint/pcl/PclPolygon.c index 41ba4b1c0..9867758bb 100644 --- a/hw/xprint/pcl/PclPolygon.c +++ b/hw/xprint/pcl/PclPolygon.c @@ -1,4 +1,3 @@ -/* $Xorg: PclPolygon.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,6 @@ 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. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPolygon.c,v 1.6 1999/12/13 02:12:56 robin Exp $ */ #ifdef HAVE_DIX_CONFIG_H diff --git a/hw/xprint/pcl/PclPrint.c b/hw/xprint/pcl/PclPrint.c index 701710253..176a0025a 100644 --- a/hw/xprint/pcl/PclPrint.c +++ b/hw/xprint/pcl/PclPrint.c @@ -1,4 +1,3 @@ -/* $Xorg: PclPrint.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -43,7 +42,6 @@ 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. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPrint.c,v 1.7tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/hw/xprint/pcl/PclSFonts.c b/hw/xprint/pcl/PclSFonts.c index 287c5c14f..2474d90d7 100644 --- a/hw/xprint/pcl/PclSFonts.c +++ b/hw/xprint/pcl/PclSFonts.c @@ -1,4 +1,3 @@ -/* $Xorg: PclSFonts.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -45,7 +44,6 @@ 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. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclSFonts.c,v 1.7tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H diff --git a/hw/xprint/pcl/PclSFonts.h b/hw/xprint/pcl/PclSFonts.h index fdd62f651..c991263df 100644 --- a/hw/xprint/pcl/PclSFonts.h +++ b/hw/xprint/pcl/PclSFonts.h @@ -1,4 +1,3 @@ -/* $Xorg: PclSFonts.h,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> #endif diff --git a/hw/xprint/pcl/PclSpans.c b/hw/xprint/pcl/PclSpans.c index 51c0137fc..4951899ab 100644 --- a/hw/xprint/pcl/PclSpans.c +++ b/hw/xprint/pcl/PclSpans.c @@ -1,4 +1,3 @@ -/* $Xorg: PclSpans.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,6 @@ 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. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclSpans.c,v 1.5 1999/12/13 02:12:57 robin Exp $ */ #ifdef HAVE_DIX_CONFIG_H diff --git a/hw/xprint/pcl/PclText.c b/hw/xprint/pcl/PclText.c index be794772c..246c0195b 100644 --- a/hw/xprint/pcl/PclText.c +++ b/hw/xprint/pcl/PclText.c @@ -1,4 +1,3 @@ -/* $Xorg: PclText.c,v 1.5 2001/03/06 16:28:48 pookie Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,6 @@ 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. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclText.c,v 1.10tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/hw/xprint/pcl/PclWindow.c b/hw/xprint/pcl/PclWindow.c index cac5826e9..adf03da8d 100644 --- a/hw/xprint/pcl/PclWindow.c +++ b/hw/xprint/pcl/PclWindow.c @@ -1,4 +1,3 @@ -/* $Xorg: PclWindow.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,6 @@ 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. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclWindow.c,v 1.10tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H diff --git a/hw/xprint/pcl/Pclmap.h b/hw/xprint/pcl/Pclmap.h index 5224fd9e3..ae88b5a42 100644 --- a/hw/xprint/pcl/Pclmap.h +++ b/hw/xprint/pcl/Pclmap.h @@ -1,4 +1,3 @@ -/* $Xorg: Pclmap.h,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. @@ -30,7 +29,6 @@ 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. */ -/* $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> diff --git a/hw/xprint/ps/Makefile.am b/hw/xprint/ps/Makefile.am index 90872d9da..08638b19d 100644 --- a/hw/xprint/ps/Makefile.am +++ b/hw/xprint/ps/Makefile.am @@ -2,8 +2,8 @@ noinst_LTLIBRARIES = libps.la INCLUDES = -I$(top_srcdir)/hw/xprint -AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ @FREETYPE_CFLAGS@ \ - -D_XP_PRINT_SERVER_ -DPSZ=8 -DXP_PSTEXT +AM_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAGS@ @FREETYPE_CFLAGS@ \ + -D_XP_PRINT_SERVER_ -DXP_PSTEXT libps_la_SOURCES = \ PsArc.c \ diff --git a/hw/xprint/ps/Ps.h b/hw/xprint/ps/Ps.h index 4effc2066..3adad39e4 100644 --- a/hw/xprint/ps/Ps.h +++ b/hw/xprint/ps/Ps.h @@ -1,4 +1,3 @@ -/* $Xorg: Ps.h,v 1.5 2001/02/09 02:04:35 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsArc.c b/hw/xprint/ps/PsArc.c index 511971e7a..0684307dd 100644 --- a/hw/xprint/ps/PsArc.c +++ b/hw/xprint/ps/PsArc.c @@ -1,4 +1,3 @@ -/* $Xorg: PsArc.c,v 1.4 2001/02/09 02:04:35 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsArea.c b/hw/xprint/ps/PsArea.c index bf6f8f42a..6ab9fa25c 100644 --- a/hw/xprint/ps/PsArea.c +++ b/hw/xprint/ps/PsArea.c @@ -1,4 +1,3 @@ -/* $Xorg: PsArea.c,v 1.6 2001/03/14 18:27:44 pookie Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsAttVal.c b/hw/xprint/ps/PsAttVal.c index fc23ffef5..de2e6c8e4 100644 --- a/hw/xprint/ps/PsAttVal.c +++ b/hw/xprint/ps/PsAttVal.c @@ -1,5 +1,4 @@ /* - * $Xorg: PsAttVal.c,v 1.5 2001/03/13 18:45:31 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company diff --git a/hw/xprint/ps/PsAttr.c b/hw/xprint/ps/PsAttr.c index 74da5a0e1..0925716f5 100644 --- a/hw/xprint/ps/PsAttr.c +++ b/hw/xprint/ps/PsAttr.c @@ -1,4 +1,3 @@ -/* $Xorg: PsAttr.c,v 1.4 2001/02/09 02:04:35 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsColor.c b/hw/xprint/ps/PsColor.c index 91a44f85a..a91272db0 100644 --- a/hw/xprint/ps/PsColor.c +++ b/hw/xprint/ps/PsColor.c @@ -1,4 +1,3 @@ -/* $Xorg: PsColor.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsDef.h b/hw/xprint/ps/PsDef.h index cf45c8516..5af274dec 100644 --- a/hw/xprint/ps/PsDef.h +++ b/hw/xprint/ps/PsDef.h @@ -1,4 +1,3 @@ -/* $Xorg: PsDef.h,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsFonts.c b/hw/xprint/ps/PsFonts.c index c4d5b03e2..8ab631441 100644 --- a/hw/xprint/ps/PsFonts.c +++ b/hw/xprint/ps/PsFonts.c @@ -1,4 +1,3 @@ -/* $Xorg: PsFonts.c,v 1.6 2001/03/06 16:30:15 pookie Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsGC.c b/hw/xprint/ps/PsGC.c index ada0b8c65..3ec07a77a 100644 --- a/hw/xprint/ps/PsGC.c +++ b/hw/xprint/ps/PsGC.c @@ -1,4 +1,3 @@ -/* $Xorg: PsGC.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsImageUtil.c b/hw/xprint/ps/PsImageUtil.c index f3052bebb..668a23f65 100644 --- a/hw/xprint/ps/PsImageUtil.c +++ b/hw/xprint/ps/PsImageUtil.c @@ -1,5 +1,4 @@ -/* $Xorg: PsImageUtil.c,v 1.1 2005/03/25 1:19:56 gisburn Exp $ */ /* Copyright (c) 2005 Roland Mainz <roland.mainz@nrubsig.org> diff --git a/hw/xprint/ps/PsInit.c b/hw/xprint/ps/PsInit.c index 06c5d11a8..639908f73 100644 --- a/hw/xprint/ps/PsInit.c +++ b/hw/xprint/ps/PsInit.c @@ -1,4 +1,3 @@ -/* $Xorg: PsInit.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsLine.c b/hw/xprint/ps/PsLine.c index 2524769c8..aca186642 100644 --- a/hw/xprint/ps/PsLine.c +++ b/hw/xprint/ps/PsLine.c @@ -1,4 +1,3 @@ -/* $Xorg: PsLine.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsMisc.c b/hw/xprint/ps/PsMisc.c index b8a3ba854..0df039e0b 100644 --- a/hw/xprint/ps/PsMisc.c +++ b/hw/xprint/ps/PsMisc.c @@ -1,4 +1,3 @@ -/* $Xorg: PsMisc.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsPixel.c b/hw/xprint/ps/PsPixel.c index 2197f0ab9..d51cb6ecf 100644 --- a/hw/xprint/ps/PsPixel.c +++ b/hw/xprint/ps/PsPixel.c @@ -1,4 +1,3 @@ -/* $Xorg: PsPixel.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsPixmap.c b/hw/xprint/ps/PsPixmap.c index f2d05d023..c3259c98c 100644 --- a/hw/xprint/ps/PsPixmap.c +++ b/hw/xprint/ps/PsPixmap.c @@ -1,4 +1,3 @@ -/* $Xorg: PsPixmap.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsPolygon.c b/hw/xprint/ps/PsPolygon.c index c4c30bc79..fe4626085 100644 --- a/hw/xprint/ps/PsPolygon.c +++ b/hw/xprint/ps/PsPolygon.c @@ -1,4 +1,3 @@ -/* $Xorg: PsPolygon.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsPrint.c b/hw/xprint/ps/PsPrint.c index 8a4f0ade8..4571c07d7 100644 --- a/hw/xprint/ps/PsPrint.c +++ b/hw/xprint/ps/PsPrint.c @@ -1,4 +1,3 @@ -/* $Xorg: PsPrint.c,v 1.7 2001/03/14 18:28:18 pookie Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsSpans.c b/hw/xprint/ps/PsSpans.c index d7652f8fb..c0e66ee7a 100644 --- a/hw/xprint/ps/PsSpans.c +++ b/hw/xprint/ps/PsSpans.c @@ -1,4 +1,3 @@ -/* $Xorg: PsSpans.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -73,7 +72,6 @@ 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> diff --git a/hw/xprint/ps/PsText.c b/hw/xprint/ps/PsText.c index 37463ba1a..98cf15345 100644 --- a/hw/xprint/ps/PsText.c +++ b/hw/xprint/ps/PsText.c @@ -1,4 +1,3 @@ -/* $Xorg: PsText.c,v 1.7 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsWindow.c b/hw/xprint/ps/PsWindow.c index d889dda9a..1317fd704 100644 --- a/hw/xprint/ps/PsWindow.c +++ b/hw/xprint/ps/PsWindow.c @@ -1,4 +1,3 @@ -/* $Xorg: PsWindow.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/psout.c b/hw/xprint/ps/psout.c index dccd692ba..c24f88b3d 100644 --- a/hw/xprint/ps/psout.c +++ b/hw/xprint/ps/psout.c @@ -1,4 +1,3 @@ -/* $Xorg: psout.c,v 1.9 2001/03/26 15:25:12 coskrey Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/psout.h b/hw/xprint/ps/psout.h index d998e2a09..3e19d5a67 100644 --- a/hw/xprint/ps/psout.h +++ b/hw/xprint/ps/psout.h @@ -1,4 +1,3 @@ -/* $Xorg: psout.h,v 1.6 2001/02/09 02:04:37 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/raster/Makefile.am b/hw/xprint/raster/Makefile.am index fcd1e7334..1ee1122f2 100644 --- a/hw/xprint/raster/Makefile.am +++ b/hw/xprint/raster/Makefile.am @@ -2,8 +2,7 @@ noinst_LTLIBRARIES = libraster.la INCLUDES = -I$(top_srcdir)/hw/xprint -AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \ - -D_XP_PRINT_SERVER_ -DPSZ=8 +AM_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAGS@ -D_XP_PRINT_SERVER_ libraster_la_SOURCES = \ RasterAttVal.c \ diff --git a/hw/xprint/raster/Raster.c b/hw/xprint/raster/Raster.c index 7ad30b446..0286a18fa 100644 --- a/hw/xprint/raster/Raster.c +++ b/hw/xprint/raster/Raster.c @@ -1,4 +1,3 @@ -/* $Xorg: Raster.c,v 1.4 2001/03/14 18:46:12 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. @@ -31,7 +30,6 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/raster/Raster.c,v 1.11tsi Exp $ */ /******************************************************************* ** diff --git a/hw/xprint/raster/Raster.h b/hw/xprint/raster/Raster.h index 25da756e5..7a613f0b0 100644 --- a/hw/xprint/raster/Raster.h +++ b/hw/xprint/raster/Raster.h @@ -1,4 +1,3 @@ -/* $Xorg: Raster.h,v 1.3 2000/08/17 19:48:12 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/raster/RasterAttVal.c b/hw/xprint/raster/RasterAttVal.c index fc00cde5a..8189be47c 100644 --- a/hw/xprint/raster/RasterAttVal.c +++ b/hw/xprint/raster/RasterAttVal.c @@ -1,4 +1,3 @@ -/* $Xorg: RasterAttVal.c,v 1.4 2001/03/14 18:46:34 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. @@ -30,7 +29,6 @@ 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. */ -/* $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> diff --git a/hw/xprint/spooler.c b/hw/xprint/spooler.c index f709c57ab..e3022b0c4 100644 --- a/hw/xprint/spooler.c +++ b/hw/xprint/spooler.c @@ -1,5 +1,4 @@ -/* $Xorg: spooler.c,v 1.1 2003/09/14 1:19:56 gisburn Exp $ */ /* Copyright (c) 2003-2004 Roland Mainz <roland.mainz@nrubsig.org> Copyright (c) 2004 Sun Microsystems, Inc. diff --git a/hw/xprint/spooler.h b/hw/xprint/spooler.h index 4e9b4aefc..4e056ceeb 100644 --- a/hw/xprint/spooler.h +++ b/hw/xprint/spooler.h @@ -6,7 +6,6 @@ #ifndef SPOOLER_H #define SPOOLER_H 1 -/* $Xorg: spooler.h,v 1.1 2003/09/14 1:19:56 gisburn Exp $ */ /* Copyright (c) 2003-2004 Roland Mainz <roland.mainz@nrubsig.org> |