From 26fe6da93bfbc80e34878fbab899959d15d70194 Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Thu, 16 Dec 2004 21:27:23 +0000 Subject: [PATCH] Renamed a struct member to avoid conflict with a C++ reserved word. --- lib/getinfo.c | 2 +- lib/url.c | 2 +- lib/urldata.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/getinfo.c b/lib/getinfo.c index 6ab6f95..f33b0d6 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; diff --git a/lib/url.c b/lib/url.c index 65d7cf0..50b5061 100644 --- a/lib/url.c +++ b/lib/url.c @@ -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 64c8a1d..407af2a 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 */ -- 2.7.4