Pull XORG-6_8_0 to CYGWIN branchCYGWIN-6_8_0-MERGE

1 files changed, 24 insertions, 25 deletions

diff --git a/Xprint/attributes.h b/Xprint/attributes.h
index b43d76af5..c4e30d274 100644
--- a/Xprint/attributes.h
+++ b/Xprint/attributes.h
@@ -30,7 +30,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/attributes.h,v 1.5 2001/08/01 00:44:45 tsi Exp $ */
 
 #ifndef _Xp_attributes_h
 #define _Xp_attributes_h 1
@@ -49,11 +48,11 @@ typedef void (*pVFunc)(VFuncArgs);
  */
 void XpInitAttributes(XpContextPtr pContext);
 void XpBuildAttributeStore(char *printerName,
-			   char *qualifierName);
+                          char *qualifierName);
 void XpAddPrinterAttribute(char *printerName,
-			   char *printerQualifier,
-			   char *attributeName,
-			   char *attributeValue);
+                          char *printerQualifier,
+                          char *attributeName,
+                          char *attributeValue);
 void XpDestroyAttributes(XpContextPtr pContext);
 char *XpGetConfigDir(Bool useLocale);
 char *XpGetOneAttribute(XpContextPtr pContext,
@@ -98,33 +97,33 @@ void XpGetMediumDimensions(XpContextPtr pContext,
 void XpGetReproductionArea(XpContextPtr pContext,
 			   xRectangle *pRect);
 void XpGetMaxWidthHeightRes(const char *printer_name,
-			   const XpValidatePoolsRec* vpr,
-			   float *width,
-			   float *height,
-			   int* resolution);
+                          const XpValidatePoolsRec* vpr,
+                          float *width,
+                          float *height,
+                          int* resolution);
 
 /* Util.c */
-char * ReplaceAnyString(char *string, 
-			char *target, 
-			char *replacement);
-char * ReplaceFileString(char *string,
-			 char *inFileName,
-			 char *outFileName);
+char *ReplaceAnyString(char *string, 
+                       char *target, 
+                       char *replacement);
+char *ReplaceFileString(char *string,
+                        char *inFileName,
+                        char *outFileName);
 void ExecCommand(char *pCommand,
-		 char **argVector);
+                char **argVector);
 int TransferBytes(FILE *pSrcFile,
-		  FILE *pDstFile,
-		  int numBytes);
+                 FILE *pDstFile,
+                 int numBytes);
 Bool CopyContentsAndDelete(FILE **ppSrcFile,
-			   char **pSrcFileName,
-			   FILE *pDstFile);
+                          char **pSrcFileName,
+                          FILE *pDstFile);
 int XpSendDocumentData(ClientPtr client,
-		       FILE *fp,
-		       int fileLen,
-		       int maxBufSize);
+                      FILE *fp,
+                      int fileLen,
+                      int maxBufSize);
 int XpFinishDocData(ClientPtr client);
 Bool XpOpenTmpFile(char *mode,
-		   char **fname,
-		   FILE **stream);
+                  char **fname,
+                  FILE **stream);
 
 #endif /* _Xp_attributes_h */