Do not remove CURLM_STATE_WAITPROXYCONNECT from the CURLMstate enum

in builds with HTTP support disabled to keep consistent enum values
for CURLMstate in all kind of builds.

diff --git a/lib/multi.c b/lib/multi.c
index 96d013d3e6b7c2d29a6f978cdafc1143e9d79edb..59e4b4419ebce98050caecf964be843e63f4d334 100644 (file)
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -61,11 +61,8 @@ typedef enum {
   CURLM_STATE_CONNECT,     /* resolve/connect has been sent off */
   CURLM_STATE_WAITRESOLVE, /* awaiting the resolve to finalize */
   CURLM_STATE_WAITCONNECT, /* awaiting the connect to finalize */
-#ifndef CURL_DISABLE_HTTP
   CURLM_STATE_WAITPROXYCONNECT, /* awaiting proxy CONNECT to finalize */
-#endif
-  CURLM_STATE_PROTOCONNECT, /* completing the protocol-specific connect
-                               phase */
+  CURLM_STATE_PROTOCONNECT, /* completing the protocol-specific connect phase */
   CURLM_STATE_WAITDO,      /* wait for our turn to send the request */
   CURLM_STATE_DO,          /* start send off the request (part 1) */
   CURLM_STATE_DOING,       /* sending off the request (part 1) */