diff options
author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2010-03-23 21:42:49 +0000 |
---|---|---|
committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2010-03-23 21:42:49 +0000 |
commit | 54afec335014303dba3c6eabe5393adce9e660ad (patch) | |
tree | 70f154e946d87bf089351ef08b66d4170f023db6 /cups/ppd.h | |
parent | ba55dc12de9ef3103d220a332ad7d26c54e397fa (diff) | |
download | cups-54afec335014303dba3c6eabe5393adce9e660ad.tar.gz |
Merge changes from CUPS 1.5svn-r9041.
(all of the media changes)
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1987 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups/ppd.h')
-rw-r--r-- | cups/ppd.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cups/ppd.h b/cups/ppd.h index d0b8ec8f2..dfda690dc 100644 --- a/cups/ppd.h +++ b/cups/ppd.h @@ -1,10 +1,9 @@ /* * "$Id: ppd.h 7791 2008-07-24 00:55:30Z mike $" * - * PostScript Printer Description definitions for the Common UNIX Printing - * System (CUPS). + * PostScript Printer Description definitions for CUPS. * - * Copyright 2007-2008 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 1997-2007 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -334,6 +333,9 @@ typedef struct ppd_file_s /**** PPD File ****/ /**** New in CUPS 1.4/Mac OS X 10.6 ****/ cups_array_t *cups_uiconstraints; /* cupsUIConstraints @since CUPS 1.4/Mac OS X 10.6@ @private@ */ + + /**** New in CUPS 1.5 ****/ + void *pwg; /* PWG to/from PPD mappings */ } ppd_file_t; |