summaryrefslogtreecommitdiff
path: root/cups/ppd-private.h
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2010-05-10 22:58:10 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2010-05-10 22:58:10 +0000
commitcc75483441ba4241a6b0079e028d7699d99a6b0f (patch)
tree07af3321d8e2ad36d8fad169a15674ce7cc4c460 /cups/ppd-private.h
parent6d2f911bdd077fee9489b1084b960c4e68fc0658 (diff)
downloadcups-cc75483441ba4241a6b0079e028d7699d99a6b0f.tar.gz
Merge changes from CUPS 1.5svn-r9136.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2180 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups/ppd-private.h')
-rw-r--r--cups/ppd-private.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/cups/ppd-private.h b/cups/ppd-private.h
index f7ade9407..2867fc83e 100644
--- a/cups/ppd-private.h
+++ b/cups/ppd-private.h
@@ -80,10 +80,12 @@ extern char *_ppdNormalizeMakeAndModel(const char *make_and_model,
extern int _ppdParseOptions(const char *s, int num_options,
cups_option_t **options);
extern _pwg_t *_pwgCreateWithPPD(ppd_file_t *ppd);
+extern const char *_pwgGetBin(_pwg_t *pwg, const char *output_bin);
extern const char *_pwgGetInputSlot(_pwg_t *pwg, ipp_t *job,
const char *keyword);
extern const char *_pwgGetMediaType(_pwg_t *pwg, ipp_t *job,
const char *keyword);
+extern const char *_pwgGetOutputBin(_pwg_t *pwg, const char *keyword);
extern const char *_pwgGetPageSize(_pwg_t *pwg, ipp_t *job,
const char *keyword, int *exact);
extern _pwg_size_t *_pwgGetSize(_pwg_t *pwg, const char *page_size);
@@ -92,7 +94,7 @@ extern const char *_pwgGetType(_pwg_t *pwg, const char *media_type);
extern const char *_pwgInputSlotForSource(const char *media_source,
char *name, size_t namesize);
extern _pwg_media_t *_pwgMediaForPPD(const char *ppd);
-extern const char *_pwgMediaTypeForType(const char *media_source,
+extern const char *_pwgMediaTypeForType(const char *media_type,
char *name, size_t namesize);
extern const char *_pwgPageSizeForMedia(_pwg_media_t *media,
char *name, size_t namesize);