diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-05-12 06:22:31 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-05-12 06:22:31 +0000 |
| commit | 321d8d57dacf00e4ae19558dc9444519f4d9ade1 (patch) | |
| tree | 6f07778268fd2099c235dd4d2f2d4aa38fcb0110 /cups/http.h | |
| parent | eac3a0a01bf37d95f4129b28296cb697c54b2613 (diff) | |
| download | cups-321d8d57dacf00e4ae19558dc9444519f4d9ade1.tar.gz | |
Merge changes from CUPS 1.5b1-r9774.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3247 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups/http.h')
| -rw-r--r-- | cups/http.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cups/http.h b/cups/http.h index 6ac8e110e..2c915e588 100644 --- a/cups/http.h +++ b/cups/http.h @@ -251,7 +251,7 @@ typedef enum http_status_e /**** HTTP status codes ****/ HTTP_NOT_SUPPORTED, /* HTTP version not supported */ HTTP_AUTHORIZATION_CANCELED = 1000, /* User canceled authorization @since CUPS 1.4@ */ - HTTP_PKI_ERROR, /* Error negotiating a secure connection @since CUPS 1.5@ */ + HTTP_PKI_ERROR, /* Error negotiating a secure connection @since CUPS 1.5/Mac OS X 10.7@ */ HTTP_WEBIF_DISABLED /* Web interface is disabled @private@ */ } http_status_t; @@ -318,7 +318,7 @@ typedef struct http_addrlist_s /**** Socket address list, which is typedef struct _http_s http_t; /**** HTTP connection type ****/ -typedef struct http_credential_s /**** Credential data @since CUPS 1.5@ ****/ +typedef struct http_credential_s /**** Credential data @since CUPS 1.5/Mac OS X 10.7@ ****/ { void *data; /* Pointer to credential data */ size_t datalen; /* Credential length */ @@ -451,8 +451,8 @@ extern void httpSetAuthString(http_t *http, const char *scheme, extern int httpAddCredential(cups_array_t *credentials, const void *data, size_t datalen) _CUPS_API_1_5; -extern int httpCopyCredentials(http_t *http, - cups_array_t **credentials) +extern int httpCopyCredentials(http_t *http, + cups_array_t **credentials) _CUPS_API_1_5; extern void httpFreeCredentials(cups_array_t *certs) _CUPS_API_1_5; extern int httpSetCredentials(http_t *http, cups_array_t *certs) |