aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2013-08-21 22:46:10 +0200
committerDaniel Stenberg <daniel@haxx.se>2013-08-22 22:45:51 +0200
commitfc99eaa5aee981e7ecc85290d964f2a5b4eb1bde (patch)
tree117f34f24cf0378645943c8b18aecded72eebefc /include
parent4bea91fc677359f3dcedb05a431258b6cd5d98f3 (diff)
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
Diffstat (limited to 'include')
-rw-r--r--include/curl/curl.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/include/curl/curl.h b/include/curl/curl.h
index 41c088108..0fb00e811 100644
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -645,16 +645,18 @@ typedef enum {
#define CURL_ERROR_SIZE 256
+enum curl_khtype {
+ CURLKHTYPE_UNKNOWN,
+ CURLKHTYPE_RSA1,
+ CURLKHTYPE_RSA,
+ CURLKHTYPE_DSS
+};
+
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 {
- CURLKHTYPE_UNKNOWN,
- CURLKHTYPE_RSA1,
- CURLKHTYPE_RSA,
- CURLKHTYPE_DSS
- } keytype;
+ enum curl_khtype keytype;
};
/* this is the set of return values expected from the curl_sshkeycallback