From: Marcel Raad <Marcel.Raad@teamviewer.com>
Date: Wed, 7 Sep 2022 08:54:16 +0000 (+0200)
Subject: curl_setup: include curl.h after platform setup headers
X-Git-Tag: curl-7_86_0~254
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4a7c10c6cc36db72efafa46915c2bd28b064a493;p=thirdparty%2Fcurl.git

curl_setup: include curl.h after platform setup headers

The platform setup headers might set definitions required for the
includes in curl.h.

Ref: https://github.com/curl/curl/pull/9375#discussion_r956998269
Closes https://github.com/curl/curl/pull/9453
---

diff --git a/lib/curl_setup.h b/lib/curl_setup.h
index e5356dcc92..54f46f899b 100644
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -158,8 +158,6 @@
 /*  please, do it beyond the point further indicated in this file.  */
 /* ================================================================ */
 
-#include <curl/curl.h>
-
 /*
  * Disable other protocols when http is the only one desired.
  */
@@ -219,7 +217,7 @@
 
 /* ================================================================ */
 /* No system header file shall be included in this file before this */
-/* point. The only allowed ones are those included from curl/system.h */
+/* point.                                                           */
 /* ================================================================ */
 
 /*
@@ -246,6 +244,8 @@
 #  include "setup-win32.h"
 #endif
 
+#include <curl/curl.h>
+
 /*
  * Use getaddrinfo to resolve the IPv4 address literal. If the current network
  * interface doesn't support IPv4, but supports IPv6, NAT64, and DNS64,