Renamed a struct member to avoid conflict with a C++ reserved word.

diff --git a/lib/getinfo.c b/lib/getinfo.c
index 6ab6f9587ee74258cec296f4e8c3440f12d0f6af..f33b0d61ac7bce3e46b23ca76dc8acef33a239a8 100644 (file)
--- 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 65d7cf0329aac54ab2e5ff49da0331a60ba829ea..50b50615d096c103b153a049b13a6e54764c4430 100644 (file)
--- 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 64c8a1d8fcf9bff30801396db76bbcd604ce0cb6..407af2aafe060d1b98d13ed63a77d9f140fe28ec 100644 (file)
--- 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 */