Commit 26fe6da9 authored by Dan Fandrich's avatar Dan Fandrich
Browse files

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

parent 8d4ac691

lib/getinfo.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

lib/url.c

+1 −1
Original line number Diff line number Diff line
@@ -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:

lib/urldata.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */