luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

src: guard for double declaration of curl_ca_embed in unity builds

Browse Source 
Seen with curl-for-win linux-musl-from-mac build with gcc 9.2.0.

```
n file included from /Users/runner/work/curl-for-win/curl-for-win/curl/_x64-linux-musl-bld/src/CMakeFiles/curl.dir/Unity/unity_0_c.c:136:
/Users/runner/work/curl-for-win/curl-for-win/curl/_x64-linux-musl-bld/src/tool_ca_embed.c:4:28: warning: redundant redeclaration of 'curl_ca_embed' [-Wredundant-decls]
    4 | extern const unsigned char curl_ca_embed[];
      |                            ^~~~~~~~~~~~~
In file included from /Users/runner/work/curl-for-win/curl-for-win/curl/_x64-linux-musl-bld/src/CMakeFiles/curl.dir/Unity/unity_0_c.c:88:
/Users/runner/work/curl-for-win/curl-for-win/curl/src/tool_operate.c:107:28: note: previous declaration of 'curl_ca_embed' was here
  107 | extern const unsigned char curl_ca_embed[];
      |                            ^~~~~~~~~~~~~
```
https://github.com/curl/curl-for-win/actions/runs/11192203640/job/31116070669#step:3:4894

Follow-up to 8a3740bc8e #14059
Closes #15307
This commit is contained in:
Viktor Szakats 2024-10-16 12:14:52 +02:00
parent adf2b4fa51
commit 6478a36b66
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mk-file-embed.pl
View File

@ -29,11 +29,16 @@ if($ARGV[0] eq "--var") {
$varname = shift @ARGV; $varname = shift @ARGV;
} }
my $varname_upper = uc($varname);
print <<HEAD print <<HEAD
/* /*
* NEVER EVER edit this manually, fix the mk-file-embed.pl script instead! * 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}[]; extern const unsigned char ${varname}[];
#endif
const unsigned char ${varname}[] = { const unsigned char ${varname}[] = {
HEAD HEAD
; ;

3
src/tool_operate.c
View File

@ -105,8 +105,11 @@ CURL_EXTERN CURLcode curl_easy_perform_ev(CURL *easy);
#include "memdebug.h" /* keep this as LAST include */ #include "memdebug.h" /* keep this as LAST include */
#ifdef CURL_CA_EMBED #ifdef CURL_CA_EMBED
#ifndef CURL_DECLARED_CURL_CA_EMBED
#define CURL_DECLARED_CURL_CA_EMBED
extern const unsigned char curl_ca_embed[]; extern const unsigned char curl_ca_embed[];
#endif #endif
#endif
#ifndef O_BINARY #ifndef O_BINARY
/* since O_BINARY as used in bitmasks, setting it to zero makes it usable in /* since O_BINARY as used in bitmasks, setting it to zero makes it usable in