Merge changes from CUPS 1.4svn-r8394.

[thirdparty/cups.git] / cups / cups.h

diff --git a/cups/cups.h b/cups/cups.h
index 153ceb4999d095968450a44ed16f5ba67760b423..8742cf29d95c50e2620ccb89938946d4e09a83f8 100644 (file)
--- a/cups/cups.h
+++ b/cups/cups.h
@@ -117,6 +117,8 @@ enum cups_ptype_e                   /**** Printer type/capability bit constants ****/
   CUPS_PRINTER_AUTHENTICATED = 0x400000,/* Printer requires authentication @since CUPS 1.2/Mac OS X 10.5@ */
   CUPS_PRINTER_COMMANDS = 0x800000,    /* Printer supports maintenance commands @since CUPS 1.2/Mac OS X 10.5@ */
   CUPS_PRINTER_DISCOVERED = 0x1000000, /* Printer was automatically discovered and added @since CUPS 1.3/Mac OS X 10.5@ */
+  CUPS_PRINTER_SCANNER = 0x2000000,    /* Scanner-only device @since CUPS 1.4@ */
+  CUPS_PRINTER_MFP = 0x4000000,                /* Printer with scanning capabilities @since CUPS 1.4@ */
   CUPS_PRINTER_OPTIONS = 0x6fffc       /* ~(CLASS | REMOTE | IMPLICIT | DEFAULT | FAX | REJECTING | DELETE | NOT_SHARED | AUTHENTICATED | COMMANDS | DISCOVERED) @private@ */
 };