From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 10 Jan 2024 10:17:58 +0000 (+0100)
Subject: curl: Fix issue with printf checks in newer curl versions
X-Git-Tag: android-2.5.0~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf017a9d17b848f10f68566e147e6a6da0b4c570;p=thirdparty%2Fstrongswan.git

curl: Fix issue with printf checks in newer curl versions

Newer curl versions (as used on macOS via Homebrew) add attributes like

  __attribute__ ((format(printf, a, b)))

to their `curl_*printf*` functions, which fails if we redefine `printf`
as e.g. `builtin_printf` (pulled in via library.h).  We could disable
these checks via CURL_NO_FMT_CHECKS, but reordering the headers should
do the trick as well.
---

diff --git a/src/libstrongswan/plugins/curl/curl_plugin.c b/src/libstrongswan/plugins/curl/curl_plugin.c
index d38df80a52..8f3166bcd6 100644
--- a/src/libstrongswan/plugins/curl/curl_plugin.c
+++ b/src/libstrongswan/plugins/curl/curl_plugin.c
@@ -15,13 +15,13 @@
  * for more details.
  */
 
-#include "curl_plugin.h"
+#include <curl/curl.h>
 
 #include <library.h>
 #include <utils/debug.h>
-#include "curl_fetcher.h"
 
-#include <curl/curl.h>
+#include "curl_plugin.h"
+#include "curl_fetcher.h"
 
 typedef struct private_curl_plugin_t private_curl_plugin_t;