build fixes

Signed-off-by: Vladimir Paramuzov <[email protected]>
openvinotoolkit · Jan 28, 2025 · c1c3c6a · c1c3c6a
1 parent 78b752c
commit c1c3c6a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/core/src/any.cpp b/src/core/src/any.cpp
@@ -7,6 +7,7 @@
 #include <limits>
 #include <string>
 #include <string_view>
+#include <array>
 #include "openvino/util/common_util.hpp"
 namespace {
 template <class Container>

diff --git a/src/inference/dev_api/openvino/runtime/plugin_config.hpp b/src/inference/dev_api/openvino/runtime/plugin_config.hpp
@@ -26,15 +26,15 @@
     #define CAT(a, b) a ## b
 #endif
 
-#define GET_EXCEPT_LAST_IMPL(N, ...) CAT(GET_EXCEPT_LAST_IMPL_, N)(__VA_ARGS__)
+#define GET_EXCEPT_LAST_IMPL(N, ...) EXPAND(CAT(GET_EXCEPT_LAST_IMPL_, N)(__VA_ARGS__))
 #define GET_EXCEPT_LAST_IMPL_2(_0, _1) _0
 #define GET_EXCEPT_LAST_IMPL_3(_0, _1, _2) _0, _1
 #define GET_EXCEPT_LAST_IMPL_4(_0, _1, _2, _3) _0, _1, _2
 #define GET_EXCEPT_LAST_IMPL_5(_0, _1, _2, _3, _4) _0, _1, _2, _3
 
 #define GET_EXCEPT_LAST(...) EXPAND(GET_EXCEPT_LAST_IMPL(COUNT(__VA_ARGS__), __VA_ARGS__))
 
-#define GET_LAST_IMPL(N, ...) CAT(GET_LAST_IMPL_, N)(__VA_ARGS__)
+#define GET_LAST_IMPL(N, ...) EXPAND(CAT(GET_LAST_IMPL_, N)(__VA_ARGS__))
 #define GET_LAST_IMPL_0(_0, ...) _0
 #define GET_LAST_IMPL_1(_0, _1, ...) _1
 #define GET_LAST_IMPL_2(_0, _1, _2, ...) _2

diff --git a/src/inference/src/dev/plugin_config.cpp b/src/inference/src/dev/plugin_config.cpp
@@ -35,7 +35,7 @@ size_t get_terminal_width() {
     } else {
         return default_width;
     }
-#elif __linux__
+#elif defined(__linux__)
     struct winsize w;
     if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &w) == 0) {
         return w.ws_col;