diff options
| author | vchigrin <[email protected]> | 2025-02-04 20:02:41 +0300 |
|---|---|---|
| committer | vchigrin <[email protected]> | 2025-02-04 22:23:46 +0300 |
| commit | f375dd25a0a21c7e9e6f0798cc124c616238c522 (patch) | |
| tree | b868fdec8f5cdbfa509a1e4b8a63d88b6e7a2584 /contrib/restricted/abseil-cpp | |
| parent | dc3b51309f2d396a9ec5039166a53da76fe220ea (diff) | |
Restore removed emscripten includes in abseil-cpp
commit_hash:8dc6a399ad7e3cf95e20e1efdf0313c9173361ea
Diffstat (limited to 'contrib/restricted/abseil-cpp')
6 files changed, 5 insertions, 7 deletions
diff --git a/contrib/restricted/abseil-cpp/.yandex_meta/__init__.py b/contrib/restricted/abseil-cpp/.yandex_meta/__init__.py index e7c7f6d2550..8ffd340d627 100644 --- a/contrib/restricted/abseil-cpp/.yandex_meta/__init__.py +++ b/contrib/restricted/abseil-cpp/.yandex_meta/__init__.py @@ -102,8 +102,6 @@ abseil_cpp = CMakeNinjaNixProject( arcdir="contrib/restricted/abseil-cpp", nixattr="abseil-cpp", disable_includes=[ - "emscripten.h", - "emscripten/*.h", # if defined(__myriad2__) "rtems.h", # if defined(__Fuchsia__) diff --git a/contrib/restricted/abseil-cpp/absl/base/config.h b/contrib/restricted/abseil-cpp/absl/base/config.h index 10747bc5f78..46e6fbcb9b2 100644 --- a/contrib/restricted/abseil-cpp/absl/base/config.h +++ b/contrib/restricted/abseil-cpp/absl/base/config.h @@ -968,7 +968,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' || #error ABSL_INTERNAL_EMSCRIPTEN_VERSION cannot be directly set #endif #ifdef __EMSCRIPTEN__ -#error #include <emscripten/version.h> +#include <emscripten/version.h> #ifdef __EMSCRIPTEN_major__ #if __EMSCRIPTEN_minor__ >= 1000 #error __EMSCRIPTEN_minor__ is too big to fit in ABSL_INTERNAL_EMSCRIPTEN_VERSION diff --git a/contrib/restricted/abseil-cpp/absl/base/internal/raw_logging.cc b/contrib/restricted/abseil-cpp/absl/base/internal/raw_logging.cc index 6f68002a3cb..d32b40a8bb7 100644 --- a/contrib/restricted/abseil-cpp/absl/base/internal/raw_logging.cc +++ b/contrib/restricted/abseil-cpp/absl/base/internal/raw_logging.cc @@ -22,7 +22,7 @@ #include <string> #ifdef __EMSCRIPTEN__ -#error #include <emscripten/console.h> +#include <emscripten/console.h> #endif #include "absl/base/attributes.h" diff --git a/contrib/restricted/abseil-cpp/absl/debugging/internal/stacktrace_emscripten-inl.inc b/contrib/restricted/abseil-cpp/absl/debugging/internal/stacktrace_emscripten-inl.inc index 16522102f64..0f444514386 100644 --- a/contrib/restricted/abseil-cpp/absl/debugging/internal/stacktrace_emscripten-inl.inc +++ b/contrib/restricted/abseil-cpp/absl/debugging/internal/stacktrace_emscripten-inl.inc @@ -20,7 +20,7 @@ #ifndef ABSL_DEBUGGING_INTERNAL_STACKTRACE_EMSCRIPTEN_INL_H_ #define ABSL_DEBUGGING_INTERNAL_STACKTRACE_EMSCRIPTEN_INL_H_ -#error #include <emscripten.h> +#include <emscripten.h> #include <atomic> #include <cstring> diff --git a/contrib/restricted/abseil-cpp/absl/debugging/symbolize_emscripten.inc b/contrib/restricted/abseil-cpp/absl/debugging/symbolize_emscripten.inc index 925cbb9b2ac..a0f344dd9b5 100644 --- a/contrib/restricted/abseil-cpp/absl/debugging/symbolize_emscripten.inc +++ b/contrib/restricted/abseil-cpp/absl/debugging/symbolize_emscripten.inc @@ -13,7 +13,7 @@ // limitations under the License. #include <cxxabi.h> -#error #include <emscripten.h> +#include <emscripten.h> #include <algorithm> #include <cstring> diff --git a/contrib/restricted/abseil-cpp/absl/log/internal/globals.cc b/contrib/restricted/abseil-cpp/absl/log/internal/globals.cc index 47896923108..359858f15ef 100644 --- a/contrib/restricted/abseil-cpp/absl/log/internal/globals.cc +++ b/contrib/restricted/abseil-cpp/absl/log/internal/globals.cc @@ -18,7 +18,7 @@ #include <cstdio> #if defined(__EMSCRIPTEN__) -#error #include <emscripten/console.h> +#include <emscripten/console.h> #endif #include "absl/base/attributes.h" |