Renamed a struct member to avoid conflict with a C++ reserved word.
This commit is contained in:
parent
8d4ac69175
commit
26fe6da93b
@ -167,7 +167,7 @@ CURLcode Curl_getinfo(struct SessionHandle *data, CURLINFO info, ...)
|
|||||||
*param_charp = data->info.contenttype;
|
*param_charp = data->info.contenttype;
|
||||||
break;
|
break;
|
||||||
case CURLINFO_PRIVATE:
|
case CURLINFO_PRIVATE:
|
||||||
*param_charp = data->set.private;
|
*param_charp = data->set.private_data;
|
||||||
break;
|
break;
|
||||||
case CURLINFO_HTTPAUTH_AVAIL:
|
case CURLINFO_HTTPAUTH_AVAIL:
|
||||||
*param_longp = data->info.httpauthavail;
|
*param_longp = data->info.httpauthavail;
|
||||||
|
@ -1311,7 +1311,7 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, ...)
|
|||||||
/*
|
/*
|
||||||
* Set private data pointer.
|
* Set private data pointer.
|
||||||
*/
|
*/
|
||||||
data->set.private = va_arg(param, char *);
|
data->set.private_data = va_arg(param, char *);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CURLOPT_MAXFILESIZE:
|
case CURLOPT_MAXFILESIZE:
|
||||||
|
@ -899,7 +899,7 @@ struct UserDefined {
|
|||||||
int dns_cache_timeout; /* DNS cache timeout */
|
int dns_cache_timeout; /* DNS cache timeout */
|
||||||
long buffer_size; /* size of receive buffer to use */
|
long buffer_size; /* size of receive buffer to use */
|
||||||
|
|
||||||
char *private; /* Private data */
|
char *private_data; /* Private data */
|
||||||
|
|
||||||
struct curl_slist *http200aliases; /* linked list of aliases for http200 */
|
struct curl_slist *http200aliases; /* linked list of aliases for http200 */
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user