[xorg-commit-diffs] xc/programs/Xserver/Xprint/raster Imakefile, 1.1.4.1.6.1, 1.1.4.1.6.1.6.1 Raster.h, 1.1.4.1.6.1, 1.1.4.1.6.1.6.1

[Roland Mainz]

Committed by: gisburn

Update of /cvs/xorg/xc/programs/Xserver/Xprint/raster
In directory pdx:/tmp/cvs-serv9732/xc/programs/Xserver/Xprint/raster

Modified Files:
      Tag: XPRINT
	Imakefile Raster.h 
Log Message:
Fix for http://xprint.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=462 - RFE: Merge xprint.mozdev.org Xprint enhancements into Xorg XPRINT branch

Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/raster/Imakefile,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.6.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.6.1
--- a/Imakefile	4 Mar 2004 17:47:24 -0000	1.1.4.1.6.1
+++ b/Imakefile	13 Apr 2004 03:16:47 -0000	1.1.4.1.6.1.6.1
@@ -1,10 +1,5 @@
 XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:48:11 cpqbld Exp $
 
-
-
-
-XCOMM $XFree86: xc/programs/Xserver/Xprint/raster/Imakefile,v 1.6 2001/08/01 00:44:46 tsi Exp $
-
 #include <Server.tmpl>
 
 SRCS1 =	Raster.c RasterAttVal.c
@@ -15,8 +10,9 @@
 OBJS = $(OBJS1)
 
    INCLUDES = -I. -I$(XINCLUDESRC) -I.. -I$(LIBSRC) \
-	      -I../../cfb -I../../mfb -I../../mi \
-	      -I../../include -I$(TOP)/include -I$(FONTINCSRC)
+             -I../../cfb -I../../mfb -I../../mi \
+             -I../../include -I$(TOP)/include -I$(FONTINCSRC)
+
 
    LINTLIBS = ../../dix/llib-ldix.ln ../../os/llib-los.ln \
 	      ../../mfb/llib-lmfb.ln ../../mi/llib-lmi.ln \

Index: Raster.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/raster/Raster.h,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.6.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.6.1
--- a/Raster.h	4 Mar 2004 17:47:24 -0000	1.1.4.1.6.1
+++ b/Raster.h	13 Apr 2004 03:16:47 -0000	1.1.4.1.6.1.6.1
@@ -30,8 +30,6 @@
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86: xc/programs/Xserver/Xprint/raster/Raster.h,v 1.3 2001/10/31 22:50:29 tsi Exp $ */
-
 /*******************************************************************
 **
 **    *********************************************************
@@ -53,6 +51,7 @@
  * Some sleazes to force the XrmDB stuff into the server
  */
 #ifndef HAVE_XPointer
+#define HAVE_XPointer 1
 typedef char *XPointer;
 #endif
 #define Status int
@@ -110,6 +109,6 @@
 extern XpValidatePoolsRec RasterValidatePoolsRec;
 
 extern Bool InitializeRasterDriver(int ndx, ScreenPtr pScreen, int argc,
-				   char **argv);
+                                  char **argv);
 
 #endif  /* _RASTER_H_ */