Disable empty resolving of contrib/libs/curl related headers

14 files changed, 24 insertions, 60 deletions

diff --git a/build/sysincl/unsorted.yml b/build/sysincl/unsorted.yml
index 771cb6f2fa..6e41724b50 100644
--- a/build/sysincl/unsorted.yml
+++ b/build/sysincl/unsorted.yml
@@ -226,17 +226,6 @@
   includes:
   - timers.h
 
-- source_filter: "^contrib/libs/curl"
-  includes:
-  - lwip/init.h
-  - lwip/netdb.h
-  - lwip/sockets.h
-
-- source_filter: "^(contrib/libs/curl/lib/vtls)"
-  includes:
-  - bearssl.h: contrib/libs/curl/lib/vtls/bearssl.h
-  - rustls.h: contrib/libs/curl/lib/vtls/rustls.h
-
 - includes:
   - cpu-features.h
   - cpuid.h
@@ -504,31 +493,6 @@
   - ../ucrt/math.h
   - ../ucrt/signal.h
   - ../ucrt/sys/stat.h
-  #if defined(BUILDING_LIBCURL)
-  - amitcp/socketbasetags.h
-  - clib.h
-  - exec/execbase.h
-  - exec/types.h
-  - extra/strdup.h
-  - extra/stricmp.h
-  - fabdef.h
-  - floss.h
-  - gnutls/crypto.h
-  - gskssl.h
-  - gss.h
-  - hasht.h
-  - ldap_ssl.h
-  - librtmp/rtmp.h
-  - nettle/des.h
-  - nettle/md4.h
-  - nettle/md5.h
-  - pk11pub.h
-  - proto/dos.h
-  - proto/exec.h
-  - qsoasync.h
-  - stabs.h
-  - tpf/sysapi.h
-  #endif
   - asm/page.h
   - asm/sgidefs.h
   - bits/char_traits.h
diff --git a/contrib/libs/curl/lib/amigaos.c b/contrib/libs/curl/lib/amigaos.c
index 4c648d9bcd..9c8806c9d9 100644
--- a/contrib/libs/curl/lib/amigaos.c
+++ b/contrib/libs/curl/lib/amigaos.c
@@ -35,10 +35,10 @@
 #  if defined(__amigaos4__)
 #    error #include <bsdsocket/socketbasetags.h>
 #  elif !defined(USE_AMISSL)
-#    include <amitcp/socketbasetags.h>
+#    error #include <amitcp/socketbasetags.h>
 #  endif
 #  ifdef __libnix__
-#    include <stabs.h>
+#    error #include <stabs.h>
 #  endif
 #endif
 
diff --git a/contrib/libs/curl/lib/curl_ntlm_core.c b/contrib/libs/curl/lib/curl_ntlm_core.c
index 0c948daed0..b5e8e16e15 100644
--- a/contrib/libs/curl/lib/curl_ntlm_core.c
+++ b/contrib/libs/curl/lib/curl_ntlm_core.c
@@ -94,7 +94,7 @@
 
 #elif defined(USE_GNUTLS)
 
-#  include <nettle/des.h>
+#  error #include <nettle/des.h>
 
 #elif defined(USE_MBEDTLS)
 
diff --git a/contrib/libs/curl/lib/curl_rtmp.c b/contrib/libs/curl/lib/curl_rtmp.c
index f7cf54e882..a1cb4be4fc 100644
--- a/contrib/libs/curl/lib/curl_rtmp.c
+++ b/contrib/libs/curl/lib/curl_rtmp.c
@@ -34,7 +34,7 @@
 #include "transfer.h"
 #include "warnless.h"
 #include <curl/curl.h>
-#include <librtmp/rtmp.h>
+#error #include <librtmp/rtmp.h>
 #include "curl_memory.h"
 /* The last #include file should be: */
 #include "memdebug.h"
diff --git a/contrib/libs/curl/lib/curl_setup.h b/contrib/libs/curl/lib/curl_setup.h
index b674cd678b..8d719ddfa4 100644
--- a/contrib/libs/curl/lib/curl_setup.h
+++ b/contrib/libs/curl/lib/curl_setup.h
@@ -274,17 +274,17 @@
 #endif
 
 #ifdef USE_LWIPSOCK
-#  include <lwip/init.h>
-#  include <lwip/sockets.h>
-#  include <lwip/netdb.h>
+#  error #include <lwip/init.h>
+#  error #include <lwip/sockets.h>
+#  error #include <lwip/netdb.h>
 #endif
 
 #ifdef HAVE_EXTRA_STRICMP_H
-#  include <extra/stricmp.h>
+#  error #include <extra/stricmp.h>
 #endif
 
 #ifdef HAVE_EXTRA_STRDUP_H
-#  include <extra/strdup.h>
+#  error #include <extra/strdup.h>
 #endif
 
 #ifdef __AMIGA__
@@ -300,10 +300,10 @@
 #      undef USE_THREADS_POSIX
 #    endif
 #  endif
-#  include <exec/types.h>
-#  include <exec/execbase.h>
-#  include <proto/exec.h>
-#  include <proto/dos.h>
+#  error #include <exec/types.h>
+#  error #include <exec/execbase.h>
+#  error #include <proto/exec.h>
+#  error #include <proto/dos.h>
 #  include <unistd.h>
 #  if defined(HAVE_PROTO_BSDSOCKET_H) && \
     (!defined(__amigaos4__) || defined(USE_AMISSL))
@@ -337,7 +337,7 @@
 
 #ifdef __TANDEM /* for ns*-tandem-nsk systems */
 # if ! defined __LP64
-#  include <floss.h> /* FLOSS is only used for 32-bit builds. */
+#  error #include <floss.h> /* FLOSS is only used for 32-bit builds. */
 # endif
 #endif
 
diff --git a/contrib/libs/curl/lib/ldap.c b/contrib/libs/curl/lib/ldap.c
index 21a55bc409..6eb25b8a0e 100644
--- a/contrib/libs/curl/lib/ldap.c
+++ b/contrib/libs/curl/lib/ldap.c
@@ -72,7 +72,7 @@
 # endif
 # error #include <ldap.h>
 # if (defined(HAVE_LDAP_SSL) && defined(HAVE_LDAP_SSL_H))
-#  include <ldap_ssl.h>
+#  error #include <ldap_ssl.h>
 # endif /* HAVE_LDAP_SSL && HAVE_LDAP_SSL_H */
 #endif
 
diff --git a/contrib/libs/curl/lib/md4.c b/contrib/libs/curl/lib/md4.c
index 664e6a19d2..d0015387b0 100644
--- a/contrib/libs/curl/lib/md4.c
+++ b/contrib/libs/curl/lib/md4.c
@@ -60,7 +60,7 @@
 #endif /* USE_MBEDTLS */
 
 #if defined(USE_GNUTLS)
-#include <nettle/md4.h>
+#error #include <nettle/md4.h>
 /* When OpenSSL or wolfSSL is available, we use their MD4 functions. */
 #elif defined(USE_WOLFSSL) && !defined(WOLFSSL_NO_MD4)
 #error #include <wolfssl/openssl/md4.h>
diff --git a/contrib/libs/curl/lib/md5.c b/contrib/libs/curl/lib/md5.c
index c79a50500e..36191e64db 100644
--- a/contrib/libs/curl/lib/md5.c
+++ b/contrib/libs/curl/lib/md5.c
@@ -58,7 +58,7 @@
 #endif
 
 #if defined(USE_GNUTLS)
-#include <nettle/md5.h>
+#error #include <nettle/md5.h>
 #elif defined(USE_OPENSSL_MD5)
 #include <openssl/md5.h>
 #elif defined(USE_WOLFSSL_MD5)
diff --git a/contrib/libs/curl/lib/mime.c b/contrib/libs/curl/lib/mime.c
index bb66130ad7..b9335e6d37 100644
--- a/contrib/libs/curl/lib/mime.c
+++ b/contrib/libs/curl/lib/mime.c
@@ -135,7 +135,7 @@ static const char aschex[] =
 
 #else
 
-#include <fabdef.h>
+#error #include <fabdef.h>
 /*
  * get_vms_file_size does what it takes to get the real size of the file
  *
diff --git a/contrib/libs/curl/lib/urldata.h b/contrib/libs/curl/lib/urldata.h
index 09773301f6..db0e73719e 100644
--- a/contrib/libs/curl/lib/urldata.h
+++ b/contrib/libs/curl/lib/urldata.h
@@ -182,7 +182,7 @@ typedef CURLcode (*Curl_datastream)(struct Curl_easy *data,
 
 #ifdef HAVE_GSSAPI
 # ifdef HAVE_GSSGNU
-#  include <gss.h>
+#  error #include <gss.h>
 # elif defined HAVE_GSSAPI_GSSAPI_H
 #  include <gssapi/gssapi.h>
 # else
diff --git a/contrib/libs/curl/lib/version.c b/contrib/libs/curl/lib/version.c
index dedcb2c267..1213123264 100644
--- a/contrib/libs/curl/lib/version.c
+++ b/contrib/libs/curl/lib/version.c
@@ -54,7 +54,7 @@
 #endif
 
 #ifdef USE_LIBRTMP
-#include <librtmp/rtmp.h>
+#error #include <librtmp/rtmp.h>
 #endif
 
 #ifdef HAVE_LIBZ
diff --git a/contrib/libs/curl/lib/vtls/bearssl.c b/contrib/libs/curl/lib/vtls/bearssl.c
index a6566f4d90..b52fc14262 100644
--- a/contrib/libs/curl/lib/vtls/bearssl.c
+++ b/contrib/libs/curl/lib/vtls/bearssl.c
@@ -25,7 +25,7 @@
 
 #ifdef USE_BEARSSL
 
-#include <bearssl.h>
+#error #include <bearssl.h>
 
 #include "bearssl.h"
 #include "urldata.h"
diff --git a/contrib/libs/curl/lib/vtls/rustls.c b/contrib/libs/curl/lib/vtls/rustls.c
index 8751fd9813..d267e26463 100644
--- a/contrib/libs/curl/lib/vtls/rustls.c
+++ b/contrib/libs/curl/lib/vtls/rustls.c
@@ -29,7 +29,7 @@
 #include "curl_printf.h"
 
 #include <errno.h>
-#include <rustls.h>
+#error #include <rustls.h>
 
 #include "inet_pton.h"
 #include "urldata.h"
diff --git a/contrib/libs/curl/src/tool_operate.c b/contrib/libs/curl/src/tool_operate.c
index c805b7732b..097e7e0d08 100644
--- a/contrib/libs/curl/src/tool_operate.c
+++ b/contrib/libs/curl/src/tool_operate.c
@@ -38,11 +38,11 @@
 #endif
 
 #ifdef __VMS
-#  include <fabdef.h>
+#  error #include <fabdef.h>
 #endif
 
 #ifdef __AMIGA__
-#  include <proto/dos.h>
+#  error #include <proto/dos.h>
 #endif
 
 #define ENABLE_CURLX_PRINTF