lib: rename internal header share.h to curl_share.h to avoid collision

Windows CRTs have a `share.h`. Before this patch when trying to
`#include <share.h>` it, the compiler picked up curl's internal
`lib/share.h` instead. Rename it to avoid this issue.

CRT `share.h` has constants necessary for using safe open CRT functions.

Also rename `lib/share.c` to keep matching the header.

Ref: https://learn.microsoft.com/cpp/c-runtime-library/sharing-constants
Ref: 625f2c1644 #16949 #16991
Cherry-picked from #19643
Closes #19676
This commit is contained in:
Viktor Szakats 2025-11-21 20:36:26 +01:00
parent 56f2479c14
commit 3887069c66
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
25 changed files with 25 additions and 25 deletions

View File

@ -172,6 +172,7 @@ LIB_CFILES = \
curl_rtmp.c \
curl_sasl.c \
curl_sha512_256.c \
curl_share.c \
curl_sspi.c \
curl_threads.c \
curl_trc.c \
@ -242,7 +243,6 @@ LIB_CFILES = \
sendf.c \
setopt.c \
sha256.c \
share.c \
slist.c \
smb.c \
smtp.c \
@ -311,6 +311,7 @@ LIB_HFILES = \
curl_setup_once.h \
curl_sha256.h \
curl_sha512_256.h \
curl_share.h \
curl_sspi.h \
curl_threads.h \
curl_trc.h \
@ -376,7 +377,6 @@ LIB_HFILES = \
setup-os400.h \
setup-vms.h \
setup-win32.h \
share.h \
sigpipe.h \
slist.h \
smb.h \

View File

@ -52,7 +52,7 @@
#include "sendf.h"
#include "hostip.h"
#include "hash.h"
#include "share.h"
#include "curl_share.h"
#include "url.h"
#include "multiif.h"
#include "curlx/inet_pton.h"

View File

@ -51,7 +51,7 @@
#include "hash.h"
#include "multiif.h"
#include "select.h"
#include "share.h"
#include "curl_share.h"
#include "url.h"
#include "curl_memory.h"
/* The last #include file should be: */

View File

@ -59,7 +59,7 @@
#include "sendf.h"
#include "hostip.h"
#include "hash.h"
#include "share.h"
#include "curl_share.h"
#include "url.h"
#include "multiif.h"
#include "curl_threads.h"

View File

@ -75,7 +75,7 @@
#include "conncache.h"
#include "multihandle.h"
#include "rand.h"
#include "share.h"
#include "curl_share.h"
#include "strdup.h"
#include "system_win32.h"
#include "curlx/version_win32.h"

View File

@ -38,7 +38,7 @@
#include "conncache.h"
#include "http_negotiate.h"
#include "http_ntlm.h"
#include "share.h"
#include "curl_share.h"
#include "sigpipe.h"
#include "connect.h"
#include "select.h"

View File

@ -72,7 +72,7 @@
#include "curlx/warnless.h"
#include "conncache.h"
#include "multihandle.h"
#include "share.h"
#include "curl_share.h"
#include "http_proxy.h"
#include "socks.h"

View File

@ -31,7 +31,7 @@
#include "psl.h"
#include "sendf.h"
#include "slist.h"
#include "share.h"
#include "curl_share.h"
#include "strcase.h"
#include "curl_fopen.h"
#include "curl_get_line.h"

View File

@ -27,7 +27,7 @@
#include <curl/curl.h>
#include "urldata.h"
#include "connect.h"
#include "share.h"
#include "curl_share.h"
#include "psl.h"
#include "vtls/vtls.h"
#include "vtls/vtls_scache.h"

View File

@ -33,7 +33,7 @@
#include "sendf.h"
#include "multiif.h"
#include "url.h"
#include "share.h"
#include "curl_share.h"
#include "curlx/base64.h"
#include "connect.h"
#include "strdup.h"

View File

@ -53,7 +53,7 @@
#include "url.h"
#include "getinfo.h"
#include "hostip.h"
#include "share.h"
#include "curl_share.h"
#include "strdup.h"
#include "progress.h"
#include "easyif.h"

View File

@ -50,7 +50,7 @@
#include "hostip.h"
#include "hash.h"
#include "rand.h"
#include "share.h"
#include "curl_share.h"
#include "url.h"
#include "curlx/inet_ntop.h"
#include "curlx/inet_pton.h"

View File

@ -47,7 +47,7 @@
#include "sendf.h"
#include "hostip.h"
#include "hash.h"
#include "share.h"
#include "curl_share.h"
#include "url.h"
/* The last 2 #include files should be in this order */

View File

@ -48,7 +48,7 @@
#include "sendf.h"
#include "hostip.h"
#include "hash.h"
#include "share.h"
#include "curl_share.h"
#include "url.h"
#include "curlx/inet_pton.h"
#include "connect.h"

View File

@ -37,7 +37,7 @@
#include "sendf.h"
#include "parsedate.h"
#include "rename.h"
#include "share.h"
#include "curl_share.h"
#include "strdup.h"
#include "curlx/strparse.h"

View File

@ -65,7 +65,7 @@
#include "http_aws_sigv4.h"
#include "url.h"
#include "urlapi-int.h"
#include "share.h"
#include "curl_share.h"
#include "hostip.h"
#include "dynhds.h"
#include "http.h"

View File

@ -33,7 +33,7 @@
#include "connect.h"
#include "progress.h"
#include "easyif.h"
#include "share.h"
#include "curl_share.h"
#include "psl.h"
#include "multiif.h"
#include "multi_ev.h"

View File

@ -29,7 +29,7 @@
#ifdef USE_LIBPSL
#include "psl.h"
#include "share.h"
#include "curl_share.h"
/* The last 2 #include files should be in this order */
#include "curl_memory.h"

View File

@ -41,7 +41,7 @@
#include "progress.h"
#include "content_encoding.h"
#include "strcase.h"
#include "share.h"
#include "curl_share.h"
#include "vtls/vtls.h"
#include "curlx/warnless.h"
#include "sendf.h"

View File

@ -81,7 +81,7 @@
#include "cookie.h"
#include "strcase.h"
#include "escape.h"
#include "share.h"
#include "curl_share.h"
#include "content_encoding.h"
#include "http_digest.h"
#include "http_negotiate.h"

View File

@ -63,7 +63,7 @@
#include "../strcase.h"
#include "../url.h"
#include "../progress.h"
#include "../share.h"
#include "../curl_share.h"
#include "../multiif.h"
#include "../curlx/fopen.h"
#include "../curlx/timeval.h"

View File

@ -41,7 +41,7 @@
#include "../strcase.h"
#include "../url.h"
#include "../llist.h"
#include "../share.h"
#include "../curl_share.h"
#include "../curl_trc.h"
#include "../curl_sha256.h"
#include "../rand.h"

View File

@ -25,7 +25,7 @@
#include "urldata.h"
#include "connect.h"
#include "share.h"
#include "curl_share.h"
#include "memdebug.h" /* LAST include file */

View File

@ -25,7 +25,7 @@
#include "urldata.h"
#include "connect.h"
#include "share.h"
#include "curl_share.h"
#include "memdebug.h" /* LAST include file */