Commit 327b46cc authored by Dan Fandrich's avatar Dan Fandrich
Browse files

Fixed a compile warning introduced by making the protocol table const. This 

involves a binary-compatible change to the API struct curl_version_info_data
parent 80d30125

include/curl/curl.h

+3 −3
Original line number Diff line number Diff line
@@ -1337,7 +1337,7 @@ typedef enum { 
/* The 'CURLVERSION_NOW' is the symbolic name meant to be used by

   basicly all programs ever, that want to get version information. It is

   meant to be a built-in version number for what kind of struct the caller

   expects. If the struct ever changes, we redfine the NOW to another enum

   expects. If the struct ever changes, we redefine the NOW to another enum

   from above. */

#define CURLVERSION_NOW CURLVERSION_THIRD
@@ -1347,11 +1347,11 @@ typedef struct { 
  unsigned int version_num; /* LIBCURL_VERSION_NUM */

  const char *host;         /* OS/host/cpu/machine when configured */

  int features;             /* bitmask, see defines below */

  char *ssl_version;        /* human readable string */

  const char *ssl_version;  /* human readable string */

  long ssl_version_num;     /* number */

  const char *libz_version;       /* human readable string */

  /* protocols is terminated by an entry with a NULL protoname */

  const char **protocols;

  const char * const *protocols;



  /* The fields below this were added in CURLVERSION_SECOND */

  const char *ares;

src/main.c

+1 −1
Original line number Diff line number Diff line
@@ -2023,7 +2023,7 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */ 
      break;

    case 'V':

    {

      const char **proto;

      const char * const *proto;



      printf(CURL_ID "%s\n", curl_version());

      if (curlinfo->protocols) {