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
This commit is contained in:
Родитель
4bea91fc67
Коммит
fc99eaa5ae
|
@ -645,16 +645,18 @@ typedef enum {
|
||||||
|
|
||||||
#define CURL_ERROR_SIZE 256
|
#define CURL_ERROR_SIZE 256
|
||||||
|
|
||||||
|
enum curl_khtype {
|
||||||
|
CURLKHTYPE_UNKNOWN,
|
||||||
|
CURLKHTYPE_RSA1,
|
||||||
|
CURLKHTYPE_RSA,
|
||||||
|
CURLKHTYPE_DSS
|
||||||
|
};
|
||||||
|
|
||||||
struct curl_khkey {
|
struct curl_khkey {
|
||||||
const char *key; /* points to a zero-terminated string encoded with base64
|
const char *key; /* points to a zero-terminated string encoded with base64
|
||||||
if len is zero, otherwise to the "raw" data */
|
if len is zero, otherwise to the "raw" data */
|
||||||
size_t len;
|
size_t len;
|
||||||
enum type {
|
enum curl_khtype keytype;
|
||||||
CURLKHTYPE_UNKNOWN,
|
|
||||||
CURLKHTYPE_RSA1,
|
|
||||||
CURLKHTYPE_RSA,
|
|
||||||
CURLKHTYPE_DSS
|
|
||||||
} keytype;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/* this is the set of return values expected from the curl_sshkeycallback
|
/* this is the set of return values expected from the curl_sshkeycallback
|
||||||
|
|
Загрузка…
Ссылка в новой задаче