summaryrefslogtreecommitdiff
path: root/cups/ppd-private.h
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2013-03-11 13:57:36 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2013-03-11 13:57:36 +0000
commitcb7f98ee7f57af247aacb94977c8f744a1d02eca (patch)
tree9a777871fa4e4f9928ff960d52ffce2343df29d8 /cups/ppd-private.h
parentc5b24bfa983a8b50262d8c3dd037e0181cfaae61 (diff)
downloadcups-cb7f98ee7f57af247aacb94977c8f744a1d02eca.tar.gz
Sync up with CUPS 1.7svn-r10893
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@4216 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups/ppd-private.h')
-rw-r--r--cups/ppd-private.h18
1 files changed, 11 insertions, 7 deletions
diff --git a/cups/ppd-private.h b/cups/ppd-private.h
index 23514b440..28016d632 100644
--- a/cups/ppd-private.h
+++ b/cups/ppd-private.h
@@ -104,9 +104,9 @@ typedef enum _pwg_print_quality_e /**** PWG print-quality values ****/
typedef struct _pwg_finishings_s /**** PWG finishings mapping data ****/
{
- ipp_finish_t value; /* finishings value */
- int num_options; /* Number of options to apply */
- cups_option_t *options; /* Options to apply */
+ ipp_finishings_t value; /* finishings value */
+ int num_options; /* Number of options to apply */
+ cups_option_t *options; /* Options to apply */
} _pwg_finishings_t;
struct _ppd_cache_s /**** PPD cache and PWG conversion data ****/
@@ -161,12 +161,16 @@ extern _ppd_cache_t *_ppdCacheCreateWithPPD(ppd_file_t *ppd);
extern void _ppdCacheDestroy(_ppd_cache_t *pc);
extern const char *_ppdCacheGetBin(_ppd_cache_t *pc,
const char *output_bin);
-extern int _ppdCacheGetFinishingOptions(_ppd_cache_t *pc, ipp_t *job,
- ipp_finish_t value, int num_options,
+extern int _ppdCacheGetFinishingOptions(_ppd_cache_t *pc,
+ ipp_t *job,
+ ipp_finishings_t value,
+ int num_options,
cups_option_t **options);
-extern int _ppdCacheGetFinishingValues(_ppd_cache_t *pc, int num_options,
+extern int _ppdCacheGetFinishingValues(_ppd_cache_t *pc,
+ int num_options,
cups_option_t *options,
- int max_values, int *values);
+ int max_values,
+ int *values);
extern const char *_ppdCacheGetInputSlot(_ppd_cache_t *pc, ipp_t *job,
const char *keyword);
extern const char *_ppdCacheGetMediaType(_ppd_cache_t *pc, ipp_t *job,