Disable includes instead of sysincl-ing them

3 files changed, 7 insertions, 11 deletions

diff --git a/contrib/libs/libxml/config.h b/contrib/libs/libxml/config.h
index 33a3b10f20b..306f9edad74 100644
--- a/contrib/libs/libxml/config.h
+++ b/contrib/libs/libxml/config.h
@@ -1,15 +1,11 @@
 #pragma once
 
-#if defined(_MSC_VER)
-#   include "config-win.h"
-#else
-#   include "config-linux.h"
-#endif
-
 #if defined(__arm__) || defined(__ARM__)
 #   include "config-armv7a.h"
-#endif
-
-#if defined(__aarch64__) || defined(_M_ARM64)
+#elif defined(__aarch64__) || defined(_M_ARM64)
 #   include "config-armv8a.h"
+#elif defined(_MSC_VER)
+#   include "config-win.h"
+#else
+#   include "config-linux.h"
 #endif
diff --git a/contrib/libs/libxml/include/libxml/encoding.h b/contrib/libs/libxml/include/libxml/encoding.h
index df8c2ef1f74..d90489456c9 100644
--- a/contrib/libs/libxml/include/libxml/encoding.h
+++ b/contrib/libs/libxml/include/libxml/encoding.h
@@ -28,7 +28,7 @@
 #include <iconv.h>
 #endif
 #ifdef LIBXML_ICU_ENABLED
-#include <unicode/ucnv.h>
+#error #include <unicode/ucnv.h>
 #endif
 #ifdef __cplusplus
 extern "C" {
diff --git a/contrib/libs/libxml/libxml.h b/contrib/libs/libxml/libxml.h
index 648de30e64f..cd22b12c4fd 100644
--- a/contrib/libs/libxml/libxml.h
+++ b/contrib/libs/libxml/libxml.h
@@ -28,7 +28,7 @@
  * This is needed to compile libxml2 for Windows CE.
  * At least I tested it with WinCE 5.0 for Emulator and WinCE 4.2/SH4 target
  */
-#include <win32config.h>
+#error #include <win32config.h>
 #include <libxml/xmlversion.h>
 #else
 /*