1 files changed, 9 insertions, 19 deletions
diff --git a/Xprint/mediaSizes.c b/Xprint/mediaSizes.c
index eaff20a88..7bb08b412 100644
--- a/Xprint/mediaSizes.c
+++ b/Xprint/mediaSizes.c
@@ -30,6 +30,8 @@ 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/mediaSizes.c,v 1.5 2001/12/21 21:02:05 dawes Exp $ */
+
 /*******************************************************************
 **
 **    *********************************************************
@@ -62,14 +64,8 @@ copyright holders.
 #include "scrnintstr.h"
 #include "fontstruct.h"
 
-#define _XP_PRINT_SERVER_
-#include "Printstr.h" 
-#undef _XP_PRINT_SERVER_
-
 #include "DiPrint.h"
-#include "AttrValid.h"
-
-extern XpContextPtr XpContextOfClient();
+#include "attributes.h"
 
 typedef struct {
     XpOid page_size;
@@ -149,8 +145,7 @@ static PageDimensionsRec PageDimensions[] =
  *       attributes pools have been validated.
  */
 int
-XpGetResolution(
-		XpContextPtr pContext)
+XpGetResolution(XpContextPtr pContext)
 {
     unsigned long resolution;
 
@@ -190,8 +185,7 @@ XpGetResolution(
  *       attributes pools have been validated.
  */
 XpOid
-XpGetContentOrientation(
-			XpContextPtr pContext)
+XpGetContentOrientation(XpContextPtr pContext)
 {
     XpOid orientation;
 
@@ -421,7 +415,7 @@ XpGetMediumMillimeters(
 		       float *width,  /* return */
 		       float *height) /* return */
 {
-    int i;
+    unsigned i;
 
     *width = *height = 0;
     for(i = 0; i < XpNumber(PageDimensions); i++)
@@ -745,9 +739,7 @@ XpGetMaxWidthHeightRes(
 }
 
 FontResolutionPtr
-XpGetClientResolutions(client, num)
-    ClientPtr client;
-    int *num;
+XpGetClientResolutions(ClientPtr client, int *num)
 {
     static struct _FontResolution res;
     int resolution = XpGetResolution(XpContextOfClient(client)); 
@@ -763,15 +755,13 @@ XpGetClientResolutions(client, num)
 }
 
 
-void XpSetFontResFunc(client)
-    ClientPtr client;
+void XpSetFontResFunc(ClientPtr client)
 {
     client->fontResFunc = XpGetClientResolutions;
 }
 
 
-void XpUnsetFontResFunc(client)
-    ClientPtr client;
+void XpUnsetFontResFunc(ClientPtr client)
 {
     client->fontResFunc = NULL;
 }