diff options
author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-11-08 00:30:03 +0000 |
---|---|---|
committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-11-08 00:30:03 +0000 |
commit | a2326b5b72c5117a00d4342dde8e4d20ff41defe (patch) | |
tree | ecd2d60a15f7bad184a6f6e7c20f846e8a4cfadf /cups/http.h | |
parent | d7225fc298cb8397b85758198e70fc5399a44720 (diff) | |
download | cups-a2326b5b72c5117a00d4342dde8e4d20ff41defe.tar.gz |
Merge changes from CUPS 1.6svn-r10112.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3486 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups/http.h')
-rw-r--r-- | cups/http.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cups/http.h b/cups/http.h index 5e3a42d3a..a70e85cf5 100644 --- a/cups/http.h +++ b/cups/http.h @@ -459,7 +459,12 @@ extern void httpFreeCredentials(cups_array_t *certs) _CUPS_API_1_5; extern int httpSetCredentials(http_t *http, cups_array_t *certs) _CUPS_API_1_5; extern void httpSetTimeout(http_t *http, double timeout, - http_timeout_cb_t cb, void *user_data); + http_timeout_cb_t cb, void *user_data) + _CUPS_API_1_5; + +/**** New in CUPS 1.6 ****/ +extern http_state_t httpGetState(http_t *http) _CUPS_API_1_6; +extern http_version_t httpGetVersion(http_t *http) _CUPS_API_1_6; /* |