From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 21 Aug 2013 20:46:10 +0000 (+0200)
Subject: curl.h: name space pollution by "enum type"
X-Git-Tag: curl-7_33_0~229
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fc99eaa5aee981e7ecc85290d964f2a5b4eb1bde;p=thirdparty%2Fcurl.git

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
---

diff --git a/include/curl/curl.h b/include/curl/curl.h
index 41c088108a..0fb00e8119 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