diff options
| author | Dan Fandrich <dan@coneharvesters.com> | 2004-12-16 21:27:23 +0000 |
|---|---|---|
| committer | Dan Fandrich <dan@coneharvesters.com> | 2004-12-16 21:27:23 +0000 |
| commit | 26fe6da93bfbc80e34878fbab899959d15d70194 (patch) | |
| tree | 8ec4308dea0cc4ae39fcebf2e8dc5840859775a5 | |
| parent | 8d4ac6917597f3158c1c22cff118ecf67df251ee (diff) | |
Renamed a struct member to avoid conflict with a C++ reserved word.
| -rw-r--r-- | lib/getinfo.c | 2 | ||||
| -rw-r--r-- | lib/url.c | 2 | ||||
| -rw-r--r-- | lib/urldata.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/getinfo.c b/lib/getinfo.c index 6ab6f9587..f33b0d61a 100644 --- a/lib/getinfo.c +++ b/lib/getinfo.c @@ -167,7 +167,7 @@ CURLcode Curl_getinfo(struct SessionHandle *data, CURLINFO info, ...) *param_charp = data->info.contenttype; break; case CURLINFO_PRIVATE: - *param_charp = data->set.private; + *param_charp = data->set.private_data; break; case CURLINFO_HTTPAUTH_AVAIL: *param_longp = data->info.httpauthavail; @@ -1311,7 +1311,7 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, ...) /* * Set private data pointer. */ - data->set.private = va_arg(param, char *); + data->set.private_data = va_arg(param, char *); break; case CURLOPT_MAXFILESIZE: diff --git a/lib/urldata.h b/lib/urldata.h index 64c8a1d8f..407af2aaf 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -899,7 +899,7 @@ struct UserDefined { int dns_cache_timeout; /* DNS cache timeout */ 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 */ |