aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/libs
diff options
context:
space:
mode:
authorthegeorg <thegeorg@yandex-team.com>2023-06-28 22:09:18 +0300
committerthegeorg <thegeorg@yandex-team.com>2023-06-28 22:09:18 +0300
commitfef9e85477600ab08d07ff1fbfa09f8096a13074 (patch)
treee8a88cd941a6e1ba6814e95339354e1e66aac719 /contrib/libs
parent17a85ebbecab569ae12788ada1352c56cc9b1e1c (diff)
downloadydb-fef9e85477600ab08d07ff1fbfa09f8096a13074.tar.gz
Disable includes instead of sysincl-ing them
Diffstat (limited to 'contrib/libs')
-rw-r--r--contrib/libs/libxml/config.h14
-rw-r--r--contrib/libs/libxml/include/libxml/encoding.h2
-rw-r--r--contrib/libs/libxml/libxml.h2
-rw-r--r--contrib/libs/re2/re2/parse.cc6
-rw-r--r--contrib/libs/re2/util/pcre.h2
-rw-r--r--contrib/libs/sqlite3/sqlite3.c8
6 files changed, 15 insertions, 19 deletions
diff --git a/contrib/libs/libxml/config.h b/contrib/libs/libxml/config.h
index 33a3b10f20..306f9edad7 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 df8c2ef1f7..d90489456c 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 648de30e64..cd22b12c4f 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
/*
diff --git a/contrib/libs/re2/re2/parse.cc b/contrib/libs/re2/re2/parse.cc
index 67a485791a..0a5e4aa1ed 100644
--- a/contrib/libs/re2/re2/parse.cc
+++ b/contrib/libs/re2/re2/parse.cc
@@ -35,9 +35,9 @@
#include "re2/walker-inl.h"
#if defined(RE2_USE_ICU)
-#include "unicode/uniset.h"
-#include "unicode/unistr.h"
-#include "unicode/utypes.h"
+#error #include "unicode/uniset.h"
+#error #include "unicode/unistr.h"
+#error #include "unicode/utypes.h"
#endif
namespace re2 {
diff --git a/contrib/libs/re2/util/pcre.h b/contrib/libs/re2/util/pcre.h
index 846f30019e..72c02bf8e1 100644
--- a/contrib/libs/re2/util/pcre.h
+++ b/contrib/libs/re2/util/pcre.h
@@ -164,7 +164,7 @@
#include "absl/strings/string_view.h"
#ifdef USEPCRE
-#include <pcre.h>
+#error #include <pcre.h>
namespace re2 {
const bool UsingPCRE = true;
} // namespace re2
diff --git a/contrib/libs/sqlite3/sqlite3.c b/contrib/libs/sqlite3/sqlite3.c
index 5467a37967..45c9d1db7d 100644
--- a/contrib/libs/sqlite3/sqlite3.c
+++ b/contrib/libs/sqlite3/sqlite3.c
@@ -206416,10 +206416,10 @@ SQLITE_API int sqlite3_rtree_init(
|| defined(SQLITE_ENABLE_ICU_COLLATIONS)
/* Include ICU headers */
-#include <unicode/utypes.h>
+#error #include <unicode/utypes.h>
#error #include <unicode/uregex.h>
-#include <unicode/ustring.h>
-#include <unicode/ucol.h>
+#error #include <unicode/ustring.h>
+#error #include <unicode/ucol.h>
/* #include <assert.h> */
@@ -206963,7 +206963,7 @@ SQLITE_API int sqlite3_icu_init(
#error #include <unicode/ubrk.h>
/* #include <unicode/ucol.h> */
/* #include <unicode/ustring.h> */
-#include <unicode/utf16.h>
+#error #include <unicode/utf16.h>
typedef struct IcuTokenizer IcuTokenizer;
typedef struct IcuCursor IcuCursor;