[BUILD] Build break with CURL 7.29.0 (#3255)

marcalff · web-flow · commit 18e06f1fc582 · 2025-01-25T01:36:10.000+01:00
diff --git a/.iwyu.imp b/.iwyu.imp
@@ -24,5 +24,8 @@
   # We prefer to include <gmock/gmock.h> for simplicity
   { "include": ["<gmock/gmock-function-mocker.h>", "private", "<gmock/gmock.h>", "public"] },
   { "include": ["<gmock/gmock-spec-builders.h>", "private", "<gmock/gmock.h>", "public"] },
+
+  # We prefer to include <curl/curl.h> for simplicity
+  { "include": ["<curl/system.h>", "private", "<curl/curl.h>", "public"] },
 ]
 
diff --git a/ext/src/http/client/curl/http_operation_curl.cc b/ext/src/http/client/curl/http_operation_curl.cc
@@ -3,7 +3,6 @@
 
 #include <curl/curl.h>
 #include <curl/curlver.h>
-#include <curl/system.h>
 
 #ifdef ENABLE_OTLP_RETRY_PREVIEW
 #  include <array>

Original file line number	Diff line number	Diff line change
`@@ -24,5 +24,8 @@`
`24`	`24`	`# We prefer to include <gmock/gmock.h> for simplicity`
`25`	`25`	`{ "include": ["<gmock/gmock-function-mocker.h>", "private", "<gmock/gmock.h>", "public"] },`
`26`	`26`	`{ "include": ["<gmock/gmock-spec-builders.h>", "private", "<gmock/gmock.h>", "public"] },`
	`27`	`+`
	`28`	`+ # We prefer to include <curl/curl.h> for simplicity`
	`29`	`+ { "include": ["<curl/system.h>", "private", "<curl/curl.h>", "public"] },`
`27`	`30`	`]`
`28`	`31`