test 15307 patch 2

vszakats · vszakats · commit 53444ad597d7 · 2024-10-16T16:21:42.000+02:00
diff --git a/curl.test.patch b/curl.test.patch
@@ -0,0 +1,37 @@
+diff --git a/src/mk-file-embed.pl b/src/mk-file-embed.pl
+index 3447aa9472b717..e4dbe35de1acdc 100755
+--- a/src/mk-file-embed.pl
++++ b/src/mk-file-embed.pl
+@@ -29,11 +29,16 @@
+     $varname = shift @ARGV;
+ }
+ 
++my $varname_upper = uc($varname);
++
+ print <<HEAD
+ /*
+  * NEVER EVER edit this manually, fix the mk-file-embed.pl script instead!
+  */
++#ifndef CURL_DECLARED_${varname_upper}
++#define CURL_DECLARED_${varname_upper}
+ extern const unsigned char ${varname}[];
++#endif
+ const unsigned char ${varname}[] = {
+ HEAD
+     ;
+diff --git a/src/tool_operate.c b/src/tool_operate.c
+index ed5ab4d6c86c57..5aadf26d23f6e9 100644
+--- a/src/tool_operate.c
++++ b/src/tool_operate.c
+@@ -105,8 +105,11 @@ CURL_EXTERN CURLcode curl_easy_perform_ev(CURL *easy);
+ #include "memdebug.h" /* keep this as LAST include */
+ 
+ #ifdef CURL_CA_EMBED
++#ifndef CURL_DECLARED_CURL_CA_EMBED
++#define CURL_DECLARED_CURL_CA_EMBED
+ extern const unsigned char curl_ca_embed[];
+ #endif
++#endif
+ 
+ #ifndef O_BINARY
+ /* since O_BINARY as used in bitmasks, setting it to zero makes it usable in
