diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:30 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:30 +0000 |
| commit | 2fb588620030ad393f8500d60e16144d59e4effe (patch) | |
| tree | 07262cbe15a40e5aeae54f62751260f83243ab79 /Xprint/AttrValid.h | |
| parent | 0664db19bf37f9dd69cca6adff4e238e310c3092 (diff) | |
Merging XORG-CURRENT into trunk
Diffstat (limited to 'Xprint/AttrValid.h')
| -rw-r--r-- | Xprint/AttrValid.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Xprint/AttrValid.h b/Xprint/AttrValid.h index 87ab48b69..8e27ae01a 100644 --- a/Xprint/AttrValid.h +++ b/Xprint/AttrValid.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/AttrValid.h,v 1.7 2001/12/21 21:02:04 dawes Exp $ */ #ifndef _Xp_AttrValid_h #define _Xp_AttrValid_h @@ -85,7 +84,7 @@ typedef struct #define XpPutStringAttr(pContext, pool, oid, value) \ XpPutOneAttribute(pContext, pool, XpOidString(oid), value) -#ifdef _XP_PRINT_SERVER_ /* needed for XpContextPtr in Printstr.h */ +#ifdef _XP_PRINT_SERVER_ /* needed for XpContextPtr in Printstr.h */ /* * XpOid-valued attribute access @@ -179,7 +178,7 @@ void XpPutMediumSSAttr(XpContextPtr pContext, XPAttributes pool, XpOid oid, const XpOidMediumSS* msss); -const XpOidMediumSS* XpGetDefaultMediumSS(void); +const XpOidMediumSS* XpGetDefaultMediumSS(); /* * XpOidTrayMediumList-valued attribute access @@ -193,15 +192,12 @@ void XpPutTrayMediumListAttr(XpContextPtr pContext, XPAttributes pool, XpOid oid, const XpOidTrayMediumList* tm); -BOOL XpOidTrayMediumListHasTray(const XpOidTrayMediumList* list, XpOid tray); - /* * Attribute pool validation */ void XpValidateAttributePool(XpContextPtr pContext, XPAttributes pool, const XpValidatePoolsRec* vpr); -void XpValidateNotificationProfile(XpContextPtr pContext); void XpValidatePrinterPool(XpContextPtr pContext, const XpValidatePoolsRec* vpr); void XpValidateJobPool(XpContextPtr pContext, @@ -210,9 +206,6 @@ void XpValidateDocumentPool(XpContextPtr pContext, const XpValidatePoolsRec* vpr); void XpValidatePagePool(XpContextPtr pContext, const XpValidatePoolsRec* vpr); -void XpValidatePrinterMediaAttrs(XpContextPtr pContext, - const XpOidList* valid_trays, - const XpOidList* valid_sizes); #endif /* _XP_PRINT_SERVER_ */ |