Merge changes from CUPS 1.6svn-r10188, including changes for <rdar://problem/10127258...

[thirdparty/cups.git] / cups / ipp-private.h

diff --git a/cups/ipp-private.h b/cups/ipp-private.h
index 1fcea0f4ec900e07d04fd4f87f79ca8b37b44d6f..70729cf591ebb7058ea6a24c30f77365c1f9732c 100644 (file)
--- a/cups/ipp-private.h
+++ b/cups/ipp-private.h
@@ -143,19 +143,14 @@ struct _ipp_s                             /**** IPP Request/Response/Notification ****/
   int                  use;            /* Use count @since CUPS 1.4.4/Mac OS X 10.6.?@ */
 };
 
-typedef struct _ipp_buffer_s           /**** Read/write buffer ****/
-{
-  unsigned char                d[IPP_BUF_SIZE];/* Data buffer */
-  struct _ipp_buffer_s *next;          /* Next buffer in list */
-  int                  used;           /* Is this buffer used? */
-} _ipp_buffer_t;
-
 typedef struct                         /**** Attribute mapping data ****/
 {
   int          multivalue;             /* Option has multiple values? */
   const char   *name;                  /* Option/attribute name */
   ipp_tag_t    value_tag;              /* Value tag for this attribute */
   ipp_tag_t    group_tag;              /* Group tag for this attribute */
+  ipp_tag_t    alt_group_tag;          /* Alternate group tag for this
+                                        * attribute */
 } _ipp_option_t;