Commit fc99eaa5 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

curl.h: name space pollution by "enum type" 

Renamed to "enum curl_khtype" now. Will break compilation for programs
that rely on the enum name.

Bug: https://github.com/bagder/curl/pull/76
Reported-by: Shawn Landden
parent 4bea91fc

include/curl/curl.h

+8 −6
Original line number Diff line number Diff line
@@ -645,16 +645,18 @@ typedef enum { 


#define CURL_ERROR_SIZE 256



struct curl_khkey {

  const char *key; /* points to a zero-terminated string encoded with base64

                      if len is zero, otherwise to the "raw" data */

  size_t len;

  enum type {

enum curl_khtype {

  CURLKHTYPE_UNKNOWN,

  CURLKHTYPE_RSA1,

  CURLKHTYPE_RSA,

  CURLKHTYPE_DSS

  } keytype;

};



struct curl_khkey {

  const char *key; /* points to a zero-terminated string encoded with base64

                      if len is zero, otherwise to the "raw" data */

  size_t len;

  enum curl_khtype keytype;

};



/* this is the set of return values expected from the curl_sshkeycallback