Merge branch 'xbzk/pavel-zbic-addendum' into zbic-support

src/common/CMakeLists.txt

@@ -151,7 +151,7 @@ add_library(
 
 set_source_files_properties(zbic_compression.cpp PROPERTIES
     INCLUDE_DIRECTORIES "${ZBIC_INCLUDE_DIR}"
-    COMPILE_OPTIONS "$<$<CXX_COMPILER_ID:Clang,GNU>:-Wno-unused-function>")
+    COMPILE_OPTIONS "$<$<CXX_COMPILER_ID:Clang,GNU>:-Wno-unused-function;-Wno-missing-declarations;-Wno-shadow>")
 
 if(WIN32)
     target_sources(common PRIVATE windows/timer_resolution.cpp

src/common/zbic_compression.cpp

@@ -12,6 +12,10 @@
 #define ZSTDERRORLIB_HIDDEN static
 #undef ZSTD_MULTITHREAD
 
+#if defined(__ANDROID__)
+#undef _GNU_SOURCE
+#endif
+
 #include "zstd.h"
 #include "zstd.c"