Skip to content

Commit 33829b8

Browse files
georgthegreatalexv-smirnov
authored andcommitted
Disable empty resolving of contrib/libs/curl related headers
1 parent 806f3b1 commit 33829b8

File tree

14 files changed

+24
-60
lines changed

14 files changed

+24
-60
lines changed

build/sysincl/unsorted.yml

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -226,17 +226,6 @@
226226
includes:
227227
- timers.h
228228

229-
- source_filter: "^contrib/libs/curl"
230-
includes:
231-
- lwip/init.h
232-
- lwip/netdb.h
233-
- lwip/sockets.h
234-
235-
- source_filter: "^(contrib/libs/curl/lib/vtls)"
236-
includes:
237-
- bearssl.h: contrib/libs/curl/lib/vtls/bearssl.h
238-
- rustls.h: contrib/libs/curl/lib/vtls/rustls.h
239-
240229
- includes:
241230
- cpu-features.h
242231
- cpuid.h
@@ -504,31 +493,6 @@
504493
- ../ucrt/math.h
505494
- ../ucrt/signal.h
506495
- ../ucrt/sys/stat.h
507-
#if defined(BUILDING_LIBCURL)
508-
- amitcp/socketbasetags.h
509-
- clib.h
510-
- exec/execbase.h
511-
- exec/types.h
512-
- extra/strdup.h
513-
- extra/stricmp.h
514-
- fabdef.h
515-
- floss.h
516-
- gnutls/crypto.h
517-
- gskssl.h
518-
- gss.h
519-
- hasht.h
520-
- ldap_ssl.h
521-
- librtmp/rtmp.h
522-
- nettle/des.h
523-
- nettle/md4.h
524-
- nettle/md5.h
525-
- pk11pub.h
526-
- proto/dos.h
527-
- proto/exec.h
528-
- qsoasync.h
529-
- stabs.h
530-
- tpf/sysapi.h
531-
#endif
532496
- asm/page.h
533497
- asm/sgidefs.h
534498
- bits/char_traits.h

contrib/libs/curl/lib/amigaos.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
# if defined(__amigaos4__)
3636
# error #include <bsdsocket/socketbasetags.h>
3737
# elif !defined(USE_AMISSL)
38-
# include <amitcp/socketbasetags.h>
38+
# error #include <amitcp/socketbasetags.h>
3939
# endif
4040
# ifdef __libnix__
41-
# include <stabs.h>
41+
# error #include <stabs.h>
4242
# endif
4343
#endif
4444

contrib/libs/curl/lib/curl_ntlm_core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494

9595
#elif defined(USE_GNUTLS)
9696

97-
# include <nettle/des.h>
97+
# error #include <nettle/des.h>
9898

9999
#elif defined(USE_MBEDTLS)
100100

contrib/libs/curl/lib/curl_rtmp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include "transfer.h"
3535
#include "warnless.h"
3636
#include <curl/curl.h>
37-
#include <librtmp/rtmp.h>
37+
#error #include <librtmp/rtmp.h>
3838
#include "curl_memory.h"
3939
/* The last #include file should be: */
4040
#include "memdebug.h"

contrib/libs/curl/lib/curl_setup.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -274,17 +274,17 @@
274274
#endif
275275

276276
#ifdef USE_LWIPSOCK
277-
# include <lwip/init.h>
278-
# include <lwip/sockets.h>
279-
# include <lwip/netdb.h>
277+
# error #include <lwip/init.h>
278+
# error #include <lwip/sockets.h>
279+
# error #include <lwip/netdb.h>
280280
#endif
281281

282282
#ifdef HAVE_EXTRA_STRICMP_H
283-
# include <extra/stricmp.h>
283+
# error #include <extra/stricmp.h>
284284
#endif
285285

286286
#ifdef HAVE_EXTRA_STRDUP_H
287-
# include <extra/strdup.h>
287+
# error #include <extra/strdup.h>
288288
#endif
289289

290290
#ifdef __AMIGA__
@@ -300,10 +300,10 @@
300300
# undef USE_THREADS_POSIX
301301
# endif
302302
# endif
303-
# include <exec/types.h>
304-
# include <exec/execbase.h>
305-
# include <proto/exec.h>
306-
# include <proto/dos.h>
303+
# error #include <exec/types.h>
304+
# error #include <exec/execbase.h>
305+
# error #include <proto/exec.h>
306+
# error #include <proto/dos.h>
307307
# include <unistd.h>
308308
# if defined(HAVE_PROTO_BSDSOCKET_H) && \
309309
(!defined(__amigaos4__) || defined(USE_AMISSL))
@@ -337,7 +337,7 @@
337337

338338
#ifdef __TANDEM /* for ns*-tandem-nsk systems */
339339
# if ! defined __LP64
340-
# include <floss.h> /* FLOSS is only used for 32-bit builds. */
340+
# error #include <floss.h> /* FLOSS is only used for 32-bit builds. */
341341
# endif
342342
#endif
343343

contrib/libs/curl/lib/ldap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
# endif
7373
# error #include <ldap.h>
7474
# if (defined(HAVE_LDAP_SSL) && defined(HAVE_LDAP_SSL_H))
75-
# include <ldap_ssl.h>
75+
# error #include <ldap_ssl.h>
7676
# endif /* HAVE_LDAP_SSL && HAVE_LDAP_SSL_H */
7777
#endif
7878

contrib/libs/curl/lib/md4.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
#endif /* USE_MBEDTLS */
6161

6262
#if defined(USE_GNUTLS)
63-
#include <nettle/md4.h>
63+
#error #include <nettle/md4.h>
6464
/* When OpenSSL or wolfSSL is available, we use their MD4 functions. */
6565
#elif defined(USE_WOLFSSL) && !defined(WOLFSSL_NO_MD4)
6666
#error #include <wolfssl/openssl/md4.h>

contrib/libs/curl/lib/md5.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
#endif
5959

6060
#if defined(USE_GNUTLS)
61-
#include <nettle/md5.h>
61+
#error #include <nettle/md5.h>
6262
#elif defined(USE_OPENSSL_MD5)
6363
#include <openssl/md5.h>
6464
#elif defined(USE_WOLFSSL_MD5)

contrib/libs/curl/lib/mime.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ static const char aschex[] =
135135

136136
#else
137137

138-
#include <fabdef.h>
138+
#error #include <fabdef.h>
139139
/*
140140
* get_vms_file_size does what it takes to get the real size of the file
141141
*

contrib/libs/curl/lib/urldata.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ typedef CURLcode (*Curl_datastream)(struct Curl_easy *data,
182182

183183
#ifdef HAVE_GSSAPI
184184
# ifdef HAVE_GSSGNU
185-
# include <gss.h>
185+
# error #include <gss.h>
186186
# elif defined HAVE_GSSAPI_GSSAPI_H
187187
# include <gssapi/gssapi.h>
188188
# else

0 commit comments

Comments
 (0)